@esri/solutions-components 0.8.6-6.3 → 0.8.6

package/dist/solutions-components/utils/downloadUtils.ts

@@ -859,9 +859,7 @@ export function _prepareAttributeValue(
           const numberFormatIntlOptions = intl.convertNumberFormatToIntlOptions(attributeFormat)
           value = intl.formatNumber(value, numberFormatIntlOptions);
         } else {
-          value = intl.formatNumber(value?.toString(), {
-            maximumFractionDigits: 100
-          });
+          value = intl.formatNumber(value);
         }
         break;
     }

package/dist/solutions-components/utils/interfaces.ts

@@ -275,6 +275,7 @@ export interface ISolutionTemplateEdits {
   [templateId: string]: ISolutionTemplateEdit;
 }
 
+//???
 export interface ISolutionModel {
   dataModel: monaco.editor.ITextModel;
   dataOriginValue: string;
@@ -305,6 +306,7 @@ export interface ISolutionModel {
 export interface ISolutionModels {
   [key: string]: ISolutionModel;
 }
+//???
 
 /**
  * Feature service name and whether the service is enabled for SR configuration
@@ -468,8 +470,6 @@ export interface ILayerDef {
   sublayerId?: number;
   fields?: string[];
   fieldOrder?: string[];
-  sortField?: string;
-  sortOrder?: 'asc' | 'desc';
 }
 
 export interface IMapChange {
@@ -572,25 +572,3 @@ export interface IConsentResponse {
 export interface IManagedLayers {
   [key: string]: "buffer" | "sketch";
 }
-
-/**
- * Key is the layers guid
- */
-export interface IReportingOptions {
-  [key: string]: IReportingOption;
-}
-
-export interface IReportingOption {
-  reporting: boolean;
-  comment: boolean;
-  like: boolean;
-  likeField?: string;
-  dislike: boolean;
-  dislikeField?: string;
-  visible: boolean;
-}
-
-export interface ISortingInfo {
-  field: string;
-  order: 'asc' | 'desc';
-}

package/dist/solutions-components/utils/mapViewUtils.ts

@@ -33,7 +33,7 @@ export async function getMapLayerHash(
   let layerHash;
   await mapView.when(() => {
     layerHash = mapView.map.allLayers.toArray().reduce((prev, cur) => {
-      if (cur.type === "feature" || cur?.type === "subtype-group") {
+      if (cur.type === "feature") {
         prev[cur.id] = {
           name: cur.title,
           supportsUpdate: undefined
@@ -169,32 +169,12 @@ export async function getAllLayers(
   const layers = mapView.map.allLayers.toArray();
   let layerViewPromises;
   await mapView.when(() => {
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     layerViewPromises = layers.map(l => mapView.whenLayerView(l));
   });
   await Promise.allSettled(layerViewPromises);
   return layers;
 }
 
-/**
- * Get all of the tables from the current map when the map and their layerView is ready
- * @param mapView the map view to fetch the table names from
- * @returns Promise resolving with an array of all tables
- *
- */
-export async function getAllTables(
-  mapView: __esri.MapView
-): Promise<__esri.Layer[]> {
-  const tables = mapView.map.allTables.toArray();
-  let layerViewPromises;
-  await mapView.when(() => {
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    layerViewPromises = tables.map(t => t.load());
-  });
-  await Promise.allSettled(layerViewPromises);
-  return tables;
-}
-
 /**
  * Highlight features by OID
  *
@@ -202,7 +182,6 @@ export async function getAllTables(
  * @param layerView the layer view to highlight
  * @param mapView the map view used if updateExtent is true
  * @param updateExtent optional (default false) boolean to indicate if we should zoom to the extent
- * @param zoomToScale optional (default 0) zoomScale that individual points will use when zoomed to
  *
  * @returns Promise resolving with the highlight handle
  */
@@ -210,11 +189,10 @@ export async function highlightFeatures(
   ids: number[],
   layerView: __esri.FeatureLayerView,
   mapView: __esri.MapView,
-  updateExtent = false,
-  zoomToScale = 0
+  updateExtent = false
 ): Promise<__esri.Handle> {
   if (updateExtent) {
-    await goToSelection(ids, layerView, mapView, false, undefined, zoomToScale);
+    await goToSelection(ids, layerView, mapView, false);
     //wait for sometime to load the feature in layerView then only the highlight will work
     await new Promise(resolve => setTimeout(resolve, 1000));
   }
@@ -317,8 +295,7 @@ export async function flashSelection(
  * @param layerView the layer view that contains the OIDs
  * @param mapView the map view to show the extent change
  * @param flashFeatures optional (default true) boolean to indicate if we should flash the features
- * @param featureEffect optional (default undefined) feature effect when flashing the features
- * @param zoomToScale optional (default to 0) zoomScale that individual points will use when zoomed to
+ *
  * @returns Promise resolving when the operation is complete
  *
  */
@@ -327,15 +304,10 @@ export async function goToSelection(
   layerView: __esri.FeatureLayerView,
   mapView: __esri.MapView,
   flashFeatures = true,
-  featureEffect: __esri.FeatureEffect = undefined,
-  zoomToScale = 0
+  featureEffect: __esri.FeatureEffect = undefined
 ): Promise<void> {
   const result = await queryExtent(ids, layerView.layer);
-  const goToParams: { target: __esri.Extent; scale?: number; } = { target: result.extent };
-  if (result.count === 1 && layerView.layer.geometryType === 'point' && zoomToScale) {
-    goToParams.scale = zoomToScale;
-  }
-  await mapView.goTo(goToParams);
+  await mapView.goTo(result.extent);
   if (flashFeatures) {
     await flashSelection(ids, layerView, featureEffect);
   }

package/dist/solutions-components/utils/pciUtils.ts

@@ -106,7 +106,7 @@ export function calculateDeductValue(
   const _showDebugging = showDebugging === true || showDebugging.toString().toLowerCase() === "true";
 
   let calc;
-  switch (_type as any) {
+  switch (_type) {
     case EDistressType.ALLIGATOR_CRACKING:
       calc = _calcAlligator;
       break;
@@ -728,7 +728,7 @@ function _calcPolishedAggregate(
   severity: ESeverity,
   density: number
 ): number {
-  const vals = severity === ESeverity.H || severity === ESeverity.M || severity === ESeverity.L ?
+  const vals = severity === "H" || severity === "M" || severity === "L" ?
     [3.417, -26.82, 71.15, -76.22, 38.52, -6.904] : [];
   return _calc(density, vals);
 }

package/dist/solutions-components/utils/pdfUtils.ts

@@ -41,7 +41,7 @@ export function exportPDF(
   title = "",
   initialImageDataUrl = ""
 ): void {
-  void downloadPDFFile(filename, labels, labelPageDescription, title, initialImageDataUrl);
+  downloadPDFFile(filename, labels, labelPageDescription, title, initialImageDataUrl);
 }
 
 //#endregion
@@ -56,15 +56,15 @@ export function exportPDF(
  * @param title Title for each page
  * @param initialImageDataUrl Data URL of image for first page
  */
-async function downloadPDFFile(
+function downloadPDFFile(
   filename: string,
   labels: string[][],
   labelPageDescription: PDFLabels.ILabel,
   title = "",
   initialImageDataUrl = ""
-): Promise<void> {
+): void {
   const pdfLib = new PDFCreator_jsPDF.PDFCreator_jsPDF();
-  await pdfLib.initialize(
+  pdfLib.initialize(
     {
       pageType: "ANSI_A"
     },
@@ -72,45 +72,52 @@ async function downloadPDFFile(
     "en",
     filename  // filename without ".pdf"
   )
-
-  const labeller = new PDFLabels.PDFLabels();
-  await labeller.initialize(pdfLib)
-
-  const labelSpec = labelPageDescription.labelSpec;
-
-  let startingPageNum = 1;
-
-  // Add the screenshot to the PDF
-  if (initialImageDataUrl) {
-    const pageProperties = labelSpec.pageProperties;
-    const pageSize = PDFCreator.PDFCreator.getPageSize(pageProperties.pageType);
-
-    pdfLib.drawImage(initialImageDataUrl, {
-      x: pageProperties.leftMargin,
-      y: pageProperties.topMargin,
-      width: pageSize.width - pageProperties.leftMargin - pageProperties.rightMargin,
-      height: pageSize.height - pageProperties.topMargin - pageProperties.bottomMargin
-    });
-
-    if (title) {
-      labeller.drawSupplementalText(title, 0, -0.1);
+  .then(
+    () => {
+      const labeller = new PDFLabels.PDFLabels();
+      labeller.initialize(pdfLib)
+      .then(
+        async () => {
+          const labelSpec = labelPageDescription.labelSpec;
+
+          let startingPageNum = 1;
+
+          // Add the screenshot to the PDF
+          if (initialImageDataUrl) {
+            const pageProperties = labelSpec.pageProperties;
+            const pageSize = PDFCreator.PDFCreator.getPageSize(pageProperties.pageType);
+
+            pdfLib.drawImage(initialImageDataUrl, {
+              x: pageProperties.leftMargin,
+              y: pageProperties.topMargin,
+              width: pageSize.width - pageProperties.leftMargin - pageProperties.rightMargin,
+              height: pageSize.height - pageProperties.topMargin - pageProperties.bottomMargin
+            });
+
+            if (title) {
+              labeller.drawSupplementalText(title, 0, -0.1);
+            }
+
+            if (labels.length > 0) {
+              pdfLib.addPage();
+              ++startingPageNum;
+            }
+          }
+
+          // Add the labels to the PDF
+          await labeller.addLabelsToDoc(
+            labels,
+            labelSpec,
+            startingPageNum,
+            title  // heading
+          );
+
+          pdfLib.save();
+        }
+      );
     }
-
-    if (labels.length > 0) {
-      pdfLib.addPage();
-      ++startingPageNum;
-    }
-  }
-
-  // Add the labels to the PDF
-  await labeller.addLabelsToDoc(
-    labels,
-    labelSpec,
-    startingPageNum,
-    title  // heading
   );
 
-  pdfLib.save();
 }
 
 //#endregion

package/dist/solutions-components/utils/popupUtils.ts

@@ -14,7 +14,6 @@
 * limitations under the License.
 */
 
-import { _prepareAttributeValue } from "./downloadUtils";
 import { loadModules } from "./loadModules";
 
 export class PopupUtils {
@@ -24,11 +23,6 @@ export class PopupUtils {
 	 */
 	arcade: typeof import("esri/arcade");
 
-	/**
-	 * esri/intl: https://developers.arcgis.com/javascript/latest/api-reference/esri-intl.html
-	 */
-	intl: typeof import("esri/intl");
-
 	/**
 	 * Get the popup title that honors arcade expressions
 	 * @param graphic selected graphic
@@ -53,7 +47,6 @@ export class PopupUtils {
 		}
 		const layer = graphic.layer as __esri.FeatureLayer;
 		const popupTitle = this._removeTags(layer?.popupTemplate?.title as string);
-		//resolve arcade expression from the popup title
 		if (popupTitle.includes("{expression/expr") && layer?.popupTemplate?.expressionInfos != null) {
 			for (let i = 0; i < layer.popupTemplate?.expressionInfos.length; i++) {
 				const info = layer.popupTemplate.expressionInfos[i];
@@ -72,18 +65,7 @@ export class PopupUtils {
 				}
 			}
 		}
-		//Format field values
-		if (layer.popupTemplate.fieldInfos) {
-			layer.fields.forEach((field) => {
-				const attributeValue = graphic.attributes[field.name];
-				//get the field info from popupTemplate
-				const fieldInfo = layer.popupTemplate.fieldInfos.find((fInfo) => fInfo.fieldName.toLowerCase() === field.name.toLowerCase());
-				//format the attribute value
-				const formattedAttributeValue = _prepareAttributeValue(attributeValue, field.type, field.domain, fieldInfo?.format, this.intl);
-				attributes[`{${field.name.toUpperCase()}}`] = formattedAttributeValue ?? attributeValue;
-			})
-		}
-		
+
 		return popupTitle?.replace(/{.*?}/g, (placeholder: string) => {
 			return attributes[placeholder.toUpperCase()] != null ? (attributes[placeholder.toUpperCase()] as string) : "";
 		});
@@ -111,12 +93,10 @@ export class PopupUtils {
 	 * @protected
 	 */
 	protected async _initModules(): Promise<void> {
-		const [arcade, intl] = await loadModules([
-			"esri/arcade",
-			"esri/intl"
+		const [arcade] = await loadModules([
+			"esri/arcade"
 		]);
 		this.arcade = arcade;
-		this.intl = intl;
 	}
 
 }

package/dist/solutions-components/utils/queryUtils.ts

@@ -48,47 +48,6 @@ export async function queryAllFeatures(
     Promise.resolve(graphics);
 }
 
-/**
- * Query the layer for all OIDs valid for any definition expressions applied to the layer.
- *
- * This query allows OIDs to be returned in the same order as shown in the FeatureTable.
- * FeatureLayer.queryObjectIds can return OIDs in a different order.
- *
- * @param start zero-based index indicating where to begin retrieving features
- * @param layer the layer to retrieve features from
- * @param graphics stores the features
- * @param orderBy One or more field names used to order the query results.
- *                Specify ASC (ascending) or DESC (descending) after the field name to control the order.
- *                The default order is ASC.
- *
- * @returns Promise with the OIDs sorted based on any orderBy definitions
- */
-export async function queryAllOidsWithQueryFeatures(
-  start: number,
-  layer: __esri.FeatureLayer,
-  graphics: __esri.Graphic[],
-  orderBy?: string[]
-): Promise<number[]> {
-  const num = layer.capabilities.query.maxRecordCount;
-  const query = layer.createQuery();
-  query.start = start;
-  query.num = num;
-  query.returnGeometry = false;
-  query.orderByFields = orderBy;
-  query.outFields = [layer.objectIdField];
-  query.where = layer.definitionExpression || "1=1";
-
-  const result = await layer.queryFeatures(query);
-
-  graphics = graphics.concat(
-    result.features
-  );
-
-  return result.exceededTransferLimit ?
-    queryAllOidsWithQueryFeatures(start += num, layer, graphics, orderBy) :
-    Promise.resolve(graphics.map(g => g.attributes[layer.objectIdField]));
-}
-
 /**
  * Query the layer for all IDs
  *

package/dist/solutions-components/utils/solution-store.ts

@@ -53,12 +53,11 @@ import {
 //   * solutionItemId: [string] id of the current solution
 //   * defaultWkid: [any] value of the solution's `params.wkid.default` data property, which may be undefined
 //   * solutionData: [ISolutionItemData] the solution's data, which is modified in-place
-//   * featureServices: [array] a list of Feature services that use a spatial reference var
+//   * featureServices: [array] a list of Feature service enablement status for SR configuration
 //   * spatialReferenceInfo: [object] the current spatial reference (if enabled) and the services that use it
 //       * enabled: [boolean] use the spatial reference
-//       * services: [object] for each service in featureServices by service name, a switch indicating if the
-//           custom spatial reference parameter is enabled/disabled
-//       * spatialReference: [object] the custom spatial reference wkid
+//       * services: [object] services using this spatial reference organized by the service name
+//       * spatialReference: [object] the spatial reference display
 //
 // Store singleton method:
 //   * Store: Creates singleton instance when accessed; default export from module.
@@ -80,7 +79,7 @@ import {
 //
 //--------------------------------------------------------------------------------------------------------------------//
 
-interface ISolutionStoreData {
+interface SolutionStoreData {
   solutionItemId: string,
   defaultWkid: string,
   solutionData: ISolutionItemData,
@@ -89,7 +88,7 @@ interface ISolutionStoreData {
   spatialReferenceInfo: ISolutionSpatialReferenceInfo
 }
 
-const EmptySolutionStore: ISolutionStoreData = {
+const EmptySolutionStore: SolutionStoreData = {
   solutionItemId: "",
   defaultWkid: undefined,
   solutionData: { metadata: {}, templates: [] },
@@ -375,12 +374,14 @@ class SolutionStore
    */
   protected _flagStoreHasChanges(flagHasChanges: boolean): void {
     // Event for notifying if the store has changes or not
-    window.dispatchEvent(new CustomEvent("solutionStoreHasChanges", {
-      detail: flagHasChanges,
-      bubbles: true,
-      cancelable: false,
-      composed: true
-    }));
+    if (this._hasChanges !== flagHasChanges) {
+      window.dispatchEvent(new CustomEvent("solutionStoreHasChanges", {
+        detail: flagHasChanges,
+        bubbles: true,
+        cancelable: false,
+        composed: true
+      }));
+    }
 
     this._hasChanges = flagHasChanges;
   }

package/dist/solutions-components/utils/templates.ts

@@ -24,13 +24,12 @@ import {
   //IItemShare,
   IOrganizationVariableItem,
   //IResourcePath,
-  ISolutionModels,
+  //SolutionModels,
   //ISolutionSpatialReferenceInfo,
   IVariableItem
 } from '../utils/interfaces';
 import {
-  IItemTemplate,
-  getProp
+  IItemTemplate
 } from '@esri/solution-common';
 
 //--------------------------------------------------------------------------
@@ -39,31 +38,6 @@ import {
 //
 //--------------------------------------------------------------------------
 
-/**
- * Gets a list of Feature Services that are not views along with an enabled property that indicates
- * if the service currently uses a spatial reference variable.
- *
- * @param templates a list of item templates from the solution
- *
- * @returns a list of feature service names and an enabled property to indicate
- * if they currently use a spatial reference variable.
- */
-export function getFeatureServices(
-  templates: IItemTemplate[]
-): any[] {
-  return templates.reduce((prev, cur) => {
-    const name: string = cur.item.title || cur.item.name;
-    if (cur.type === "Feature Service" &&
-      cur.item.typeKeywords.indexOf("View Service") < 0 &&
-      prev.indexOf(name) < 0
-    ) {
-      const wkid = getProp(cur, "properties.service.spatialReference.wkid");
-      prev.push({ name, enabled: wkid.toString().startsWith("{{params.wkid||")});
-    }
-    return prev;
-  }, []);
-}
-
 /**
  * Sort the solution items
  *
@@ -157,83 +131,6 @@ export function getItemHierarchy(
   return hierarchy;
 }
 
-/**
- * Create and store text models for the editor as well as other key values such as the original values
- * that can be used to clear any temp edits.
- *
- * @param templates a list of item templates from the solution
- *
- * @returns a list of models and key values
- */
-export function getModels(templates: any[]): ISolutionModels {
-  const ids: string[] = [];
-  const models: ISolutionModels = {};
-  const monacoDefined = typeof(monaco) !== "undefined";
-  templates.forEach(t => {
-    if (ids.indexOf(t.itemId) < 0) {
-      ids.push(t.itemId);
-      models[t.itemId] = {
-        dataModel: monacoDefined ? monaco.editor.createModel(JSON.stringify(t.data, null, '\t'), "json") : undefined,
-        dataOriginValue: JSON.stringify(t.data),
-        propsModel: monacoDefined ? monaco.editor.createModel(JSON.stringify(t.properties, null, '\t'), "json") : undefined,
-        propsOriginValue: JSON.stringify(t.properties),
-        propsDiffOriginValue: JSON.stringify(t.properties),
-        state: undefined,
-        shareInfo: undefined,
-        isEditing: false,
-        itemId: t.itemId,
-        updateItemValues: {},
-        originalItemValues: {},
-        name: t.item?.name,
-        title: t.item?.title,
-        itemOriginValue: JSON.stringify(t.item),
-        spatialReference: t.properties?.service?.spatialReference,
-        resources: [], //???
-        resourceFilePaths: [], //???
-        sourceResourceFilePaths: [], //???
-        thumbnailOrigin: undefined, //???
-        thumbnailNew: undefined, //???
-        type: t.type
-      };
-    }
-  });
-  return models;
-}
-
-/**
- * Set key organization variables we will allow users to insert at runtime
- *
- * @param translations nls translation object
- *
- * @returns a list of variables for the organization
- */
-export function getOrganizationVariables(
-  translations: any
-): IOrganizationVariableItem[] {
-  const orgVars: IOrganizationVariableItem[] = [{
-    id: "",
-    title: translations.geocodeUrl,
-    value: "{{organization.helperServices.geocode:getDefaultLocatorURL}}"
-  }, {
-    id: "",
-    title: translations.geometryUrl,
-    value: "{{organization.helperServices.geometry.url}}"
-  }, {
-    id: "",
-    title: translations.portalBaseUrl,
-    value: "{{portalBaseUrl}}"
-  }, {
-    id: "",
-    title: translations.routeUrl,
-    value: "{{organization.helperServices.route.url}}"
-  }, {
-    id: "",
-    title: translations.solutionItemExtent,
-    value: "{{solutionItemExtent}}"
-  }];
-  return orgVars;
-}
-
 /**
  * Explore the solution item templates for variables we will allow users to insert at runtime
  *
@@ -284,29 +181,37 @@ export function getSolutionVariables(
 }
 
 /**
- * Stores basic spatial reference information that is used to determine if a custom spatial reference parameter will
- * be exposed while deploying this solution and if so what feature services will support it and what will the default wkid be
+ * Set key organization variables we will allow users to insert at runtime
  *
- * @param services a list of objects with service name and enabled property (indicates if they currently use a spatial reference var)
- * @param data the data object of a solution item
+ * @param translations nls translation object
  *
- * @returns an object that stores if a custom spatial reference parameter is enabled/disabled,
- * a list of services and if they are enabled/disabled, and the default wkid
+ * @returns a list of variables for the organization
  */
-export function getSpatialReferenceInfo(
-  services: any[],
-  data: any
-): any {
-  const defaultServices: any = {};
-  services.forEach(service => {
-    defaultServices[service.name] = service.enabled;
-  });
-  const wkid = getProp(data, "params.wkid.default");
-  return {
-    enabled: wkid !== undefined && wkid !== "",
-    services: defaultServices,
-    spatialReference: wkid ? { wkid } : undefined
-  }
+export function getOrganizationVariables(
+  translations: any
+): IOrganizationVariableItem[] {
+  const orgVars: IOrganizationVariableItem[] = [{
+    id: "",
+    title: translations.geocodeUrl,
+    value: "{{organization.helperServices.geocode:getDefaultLocatorURL}}"
+  }, {
+    id: "",
+    title: translations.geometryUrl,
+    value: "{{organization.helperServices.geometry.url}}"
+  }, {
+    id: "",
+    title: translations.portalBaseUrl,
+    value: "{{portalBaseUrl}}"
+  }, {
+    id: "",
+    title: translations.routeUrl,
+    value: "{{organization.helperServices.route.url}}"
+  }, {
+    id: "",
+    title: translations.solutionItemExtent,
+    value: "{{solutionItemExtent}}"
+  }];
+  return orgVars;
 }
 
 //--------------------------------------------------------------------------

package/dist/solutions-components/utils/test/templates.e2e.ts

@@ -22,8 +22,8 @@ import * as electionOutreach from '../../demos/data/election-outreach.json';
 describe("getInventoryItems", () => {
   it("can get inventory items", () => {
     const templates = electionOutreach.templates;
-    expect(templates.length).toEqual(12)
+    expect(templates.length).toEqual(11)
     const actual = getInventoryItems(templates);
-    expect(actual.length).toEqual(6);
+    expect(actual.length).toEqual(5);
   });
 });