@esri/solutions-components 0.7.18 → 0.7.20

package/dist/collection/demos/assets/t9n/instant-apps-social-share/resources_zh-HK.json

@@ -1,38 +1,38 @@
-{
-  "share": {
-    "label": "分享"
-  },
-  "embed": {
-    "label": "內嵌",
-    "copy": "複製",
-    "width": "寬度",
-    "height": "高度"
-  },
-  "info": {
-    "label": "您知道嗎?",
-    "tooltip": "複製連結將會保留目前的地圖視圖、可見圖層及開啟的快顯視窗。 使用此選項可分享您在應用程式中看見的內容。"
-  },
-  "success": {
-    "label": "成功!",
-    "url": "應用程式 URL 已複製到剪貼簿。",
-    "embed": "內嵌程式碼已複製到剪貼簿。"
-  },
-  "options": {
-    "link": {
-      "label": "複製連結",
-      "tooltip": "按一下以將連結複製到剪貼簿"
-    },
-    "facebook": {
-      "label": "Facebook",
-      "tooltip": "按一下以分享到您的 Facebook 帳號"
-    },
-    "twitter": {
-      "label": "Twitter",
-      "tooltip": "按一下以分享到您的 Twitter 帳號"
-    },
-    "linkedIn": {
-      "label": "LinkedIn",
-      "tooltip": "按一下以分享到您的 LinkedIn 帳號"
-    }
-  }
+{
+  "share": {
+    "label": "分享"
+  },
+  "embed": {
+    "label": "內嵌",
+    "copy": "複製",
+    "width": "寬度",
+    "height": "高度"
+  },
+  "info": {
+    "label": "您知道嗎?",
+    "tooltip": "複製連結將會保留目前的地圖視圖、可見圖層及開啟的快顯視窗。 使用此選項可分享您在應用程式中看見的內容。"
+  },
+  "success": {
+    "label": "成功!",
+    "url": "應用程式 URL 已複製到剪貼簿。",
+    "embed": "內嵌程式碼已複製到剪貼簿。"
+  },
+  "options": {
+    "link": {
+      "label": "複製連結",
+      "tooltip": "按一下以將連結複製到剪貼簿"
+    },
+    "facebook": {
+      "label": "Facebook",
+      "tooltip": "按一下以分享到您的 Facebook 帳號"
+    },
+    "twitter": {
+      "label": "Twitter",
+      "tooltip": "按一下以分享到您的 Twitter 帳號"
+    },
+    "linkedIn": {
+      "label": "LinkedIn",
+      "tooltip": "按一下以分享到您的 LinkedIn 帳號"
+    }
+  }
 }

package/dist/collection/demos/assets/t9n/instant-apps-social-share/resources_zh-TW.json

@@ -1,38 +1,38 @@
-{
-  "share": {
-    "label": "分享"
-  },
-  "embed": {
-    "label": "內嵌",
-    "copy": "複製",
-    "width": "寬度",
-    "height": "高度"
-  },
-  "info": {
-    "label": "您知道嗎?",
-    "tooltip": "複製連結將會保留目前的地圖視圖、可見圖層及開啟的快顯視窗。 使用此選項可分享您在應用程式中看見的內容。"
-  },
-  "success": {
-    "label": "成功!",
-    "url": "應用程式 URL 已複製到剪貼簿。",
-    "embed": "內嵌程式碼已複製到剪貼簿。"
-  },
-  "options": {
-    "link": {
-      "label": "複製連結",
-      "tooltip": "按一下以將連結複製到剪貼簿"
-    },
-    "facebook": {
-      "label": "Facebook",
-      "tooltip": "按一下以分享到您的 Facebook 帳號"
-    },
-    "twitter": {
-      "label": "Twitter",
-      "tooltip": "按一下以分享到您的 Twitter 帳號"
-    },
-    "linkedIn": {
-      "label": "LinkedIn",
-      "tooltip": "按一下以分享到您的 LinkedIn 帳號"
-    }
-  }
+{
+  "share": {
+    "label": "分享"
+  },
+  "embed": {
+    "label": "內嵌",
+    "copy": "複製",
+    "width": "寬度",
+    "height": "高度"
+  },
+  "info": {
+    "label": "您知道嗎?",
+    "tooltip": "複製連結將會保留目前的地圖視圖、可見圖層及開啟的快顯視窗。 使用此選項可分享您在應用程式中看見的內容。"
+  },
+  "success": {
+    "label": "成功!",
+    "url": "應用程式 URL 已複製到剪貼簿。",
+    "embed": "內嵌程式碼已複製到剪貼簿。"
+  },
+  "options": {
+    "link": {
+      "label": "複製連結",
+      "tooltip": "按一下以將連結複製到剪貼簿"
+    },
+    "facebook": {
+      "label": "Facebook",
+      "tooltip": "按一下以分享到您的 Facebook 帳號"
+    },
+    "twitter": {
+      "label": "Twitter",
+      "tooltip": "按一下以分享到您的 Twitter 帳號"
+    },
+    "linkedIn": {
+      "label": "LinkedIn",
+      "tooltip": "按一下以分享到您的 LinkedIn 帳號"
+    }
+  }
 }

package/dist/collection/demos/assets/t9n/instant-apps-splash/resources.json

@@ -1,3 +1,3 @@
-{
-    "dontShowThisAgain": "Don't show this again"
+{
+    "dontShowThisAgain": "Don't show this again"
 }

package/dist/collection/demos/assets/t9n/instant-apps-splash/resources_en.json

@@ -1,3 +1,3 @@
-{
-    "dontShowThisAgain": "Don't show this again"
+{
+    "dontShowThisAgain": "Don't show this again"
 }

package/dist/collection/demos/crowdsource-manager.html

@@ -25,6 +25,7 @@
       .crowdsource {
         height: 100vh;
         width: 100vw;
+        display: flex;
       }
     </style>
 
@@ -55,13 +56,6 @@
                 name: "Map from URL"
               }];
               break;
-            // TODO enable when ready for review...have some questions that I need to discuss with the team
-            // case "hideMap":
-            //   demo.hideMap = v.toLocaleLowerCase() === "true";
-            //   break;
-            case "classicGrid":
-              demo.classicGrid = v.toLocaleLowerCase() === "true";
-              break;
             case "zoomAndScrollToSelected":
               demo.zoomAndScrollToSelected = v.toLocaleLowerCase() === "true";
               break;

package/dist/collection/utils/downloadUtils.js

@@ -40,12 +40,12 @@ import { queryRelated } from "@esri/arcgis-rest-feature-layer";
  * @param includeHeaderNames Add the label format at the front of the list of generated labels
  * @returns selectionSetNames that will be used for export filenames
  */
-export async function consolidateLabels(webmap, exportInfos, formatUsingLayerPopup = true, includeHeaderNames = false, isCSVExport = false) {
+export async function consolidateLabels(webmap, exportInfos, formatUsingLayerPopup = true, includeHeaderNames = false, isCSVExport = false, fields = []) {
     const labelRequests = [];
     Object.keys(exportInfos).forEach(k => {
         var _a;
         const labelInfo = exportInfos[k];
-        labelRequests.push(_prepareLabels(webmap, ((_a = labelInfo.layerView) === null || _a === void 0 ? void 0 : _a.layer) || labelInfo.layer, labelInfo.ids, formatUsingLayerPopup, includeHeaderNames));
+        labelRequests.push(_prepareLabels(webmap, ((_a = labelInfo.layerView) === null || _a === void 0 ? void 0 : _a.layer) || labelInfo.layer, labelInfo.ids, formatUsingLayerPopup, includeHeaderNames, fields));
         if (isCSVExport) {
             // add the layer id as a temp value separator that we can use to split values for CSV export
             labelRequests.push(Promise.resolve([[k]]));
@@ -65,8 +65,8 @@ export async function consolidateLabels(webmap, exportInfos, formatUsingLayerPop
  * @param addColumnTitle Indicates if column headings should be included in output
  * @returns Promise resolving when function is done
  */
-export async function downloadCSV(webmap, exportInfos, formatUsingLayerPopup, removeDuplicates = false, addColumnTitle = false) {
-    let labels = await consolidateLabels(webmap, exportInfos, formatUsingLayerPopup, addColumnTitle, true);
+export async function downloadCSV(webmap, exportInfos, formatUsingLayerPopup, removeDuplicates = false, addColumnTitle = false, fields = []) {
+    let labels = await consolidateLabels(webmap, exportInfos, formatUsingLayerPopup, addColumnTitle, true, fields);
     labels = removeDuplicates ? removeDuplicateLabels(labels) : labels;
     const layerIds = Object.keys(exportInfos);
     let layerLabels = [];
@@ -605,7 +605,7 @@ export function _prepareAttributeValue(attributeValue, attributeType, attributeD
  * @param includeHeaderNames Add the label format at the front of the list of generated labels
  * @returns Promise resolving when function is done
  */
-export async function _prepareLabels(webmap, layer, ids, formatUsingLayerPopup = true, includeHeaderNames = false) {
+export async function _prepareLabels(webmap, layer, ids, formatUsingLayerPopup = true, includeHeaderNames = false, fields = []) {
     // Get the label formatting, if any
     const labelFormatProps = await _getLabelFormat(webmap, layer, formatUsingLayerPopup);
     // Because the label may actually come from a related layer, we'll use the layer that comes back from _getLabelFormat.
@@ -664,7 +664,8 @@ export async function _prepareLabels(webmap, layer, ids, formatUsingLayerPopup =
     }
     else {
         // Get the features to export
-        featureSet = await queryFeaturesByID(ids, featureLayer, [], false);
+        const outFields = fields.length > 0 ? fields : undefined;
+        featureSet = await queryFeaturesByID(ids, featureLayer, [], false, undefined, outFields);
     }
     // Get field data types. Do we have any domain-based fields?
     const attributeOrigNames = {};
@@ -672,17 +673,21 @@ export async function _prepareLabels(webmap, layer, ids, formatUsingLayerPopup =
     const attributeDomains = {};
     if (featureLayer.fields) {
         featureLayer.fields.forEach(field => {
-            const lowercaseFieldname = field.name.toLowerCase();
-            attributeOrigNames[lowercaseFieldname] = field.name;
-            attributeDomains[lowercaseFieldname] = field.domain;
-            attributeTypes[lowercaseFieldname] = field.type;
+            if (fields.indexOf(field.name.toLowerCase()) > -1) {
+                const lowercaseFieldname = field.name.toLowerCase();
+                attributeOrigNames[lowercaseFieldname] = field.name;
+                attributeDomains[lowercaseFieldname] = field.domain;
+                attributeTypes[lowercaseFieldname] = field.type;
+            }
         });
     }
     else {
         // Feature layer is missing fields, so get info from first feature
         Object.keys(featureSet[0]).forEach(fieldName => {
-            const lowercaseFieldname = fieldName.toLowerCase();
-            attributeOrigNames[lowercaseFieldname] = fieldName;
+            if (fields.indexOf(fieldName.toLowerCase()) > -1) {
+                const lowercaseFieldname = fieldName.toLowerCase();
+                attributeOrigNames[lowercaseFieldname] = fieldName;
+            }
         });
     }
     // Apply the label format

package/dist/collection/utils/downloadUtils.ts

@@ -125,14 +125,15 @@ export async function consolidateLabels(
   exportInfos: IExportInfos,
   formatUsingLayerPopup = true,
   includeHeaderNames = false,
-  isCSVExport = false
+  isCSVExport = false,
+  fields = []
 ): Promise<string[][]> {
   const labelRequests = [];
 
   Object.keys(exportInfos).forEach(k => {
     const labelInfo: IExportInfo = exportInfos[k];
     labelRequests.push(
-      _prepareLabels(webmap, labelInfo.layerView?.layer || labelInfo.layer, labelInfo.ids, formatUsingLayerPopup, includeHeaderNames)
+      _prepareLabels(webmap, labelInfo.layerView?.layer || labelInfo.layer, labelInfo.ids, formatUsingLayerPopup, includeHeaderNames, fields)
     );
     if (isCSVExport) {
       // add the layer id as a temp value separator that we can use to split values for CSV export
@@ -160,9 +161,10 @@ export async function downloadCSV(
   exportInfos: IExportInfos,
   formatUsingLayerPopup: boolean,
   removeDuplicates = false,
-  addColumnTitle = false
+  addColumnTitle = false,
+  fields = []
 ): Promise<void> {
-  let labels = await consolidateLabels(webmap, exportInfos, formatUsingLayerPopup, addColumnTitle, true);
+  let labels = await consolidateLabels(webmap, exportInfos, formatUsingLayerPopup, addColumnTitle, true, fields);
   labels = removeDuplicates ? removeDuplicateLabels(labels) : labels;
 
   const layerIds = Object.keys(exportInfos);
@@ -838,7 +840,8 @@ export async function _prepareLabels(
   layer: __esri.FeatureLayer,
   ids: number[],
   formatUsingLayerPopup = true,
-  includeHeaderNames = false
+  includeHeaderNames = false,
+  fields = []
 ): Promise<string[][]> {
   // Get the label formatting, if any
   const labelFormatProps: ILabelFormatProps = await _getLabelFormat(webmap, layer, formatUsingLayerPopup);
@@ -909,7 +912,8 @@ export async function _prepareLabels(
 
   } else {
     // Get the features to export
-    featureSet = await queryFeaturesByID(ids, featureLayer, [], false);
+    const outFields = fields.length > 0 ? fields : undefined;
+    featureSet = await queryFeaturesByID(ids, featureLayer, [], false, undefined, outFields);
   }
 
   // Get field data types. Do we have any domain-based fields?
@@ -920,18 +924,22 @@ export async function _prepareLabels(
   if (featureLayer.fields) {
     featureLayer.fields.forEach(
       field => {
-        const lowercaseFieldname = field.name.toLowerCase();
-        attributeOrigNames[lowercaseFieldname] = field.name;
-        attributeDomains[lowercaseFieldname] = field.domain;
-        attributeTypes[lowercaseFieldname] = field.type;
+        if (fields.indexOf(field.name.toLowerCase()) > -1) {
+          const lowercaseFieldname = field.name.toLowerCase();
+          attributeOrigNames[lowercaseFieldname] = field.name;
+          attributeDomains[lowercaseFieldname] = field.domain;
+          attributeTypes[lowercaseFieldname] = field.type;
+        }
       }
     );
   } else {
     // Feature layer is missing fields, so get info from first feature
     Object.keys(featureSet[0]).forEach(
       fieldName => {
-        const lowercaseFieldname = fieldName.toLowerCase();
-        attributeOrigNames[lowercaseFieldname] = fieldName;
+        if (fields.indexOf(fieldName.toLowerCase()) > -1) {
+          const lowercaseFieldname = fieldName.toLowerCase();
+          attributeOrigNames[lowercaseFieldname] = fieldName;
+        }
       }
     )
   }

package/dist/collection/utils/interfaces.ts

@@ -539,3 +539,8 @@ export interface ILayerAndTableIds {
   layerIds: string[];
   tableIds: string[];
 }
+
+export interface IPopupUtils {
+  arcade: typeof import("esri/arcade");
+  getPopupTitle(graphic: __esri.Graphic): Promise<string>;
+}

package/dist/collection/utils/popupUtils.js

@@ -0,0 +1,94 @@
+/*!
+ * Copyright 2022 Esri
+ * Licensed under the Apache License, Version 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+/** @license
+ * Copyright 2022 Esri
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*    http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+import { loadModules } from "./loadModules";
+export class PopupUtils {
+    /**
+     * Get the popup title that honors arcade expressions
+     *
+     * @returns Promise resolving with the popup title
+     *
+     * @protected
+     */
+    async getPopupTitle(graphic) {
+        var _a, _b, _c;
+        if (!this.arcade) {
+            await this._initModules();
+        }
+        let attributes = {};
+        for (const [key, value] of Object.entries(graphic.attributes)) {
+            attributes = Object.assign(Object.assign({}, attributes), { [`{${key.toUpperCase()}}`]: value });
+        }
+        const layer = graphic.layer;
+        const popupTitle = this._removeTags((_a = layer === null || layer === void 0 ? void 0 : layer.popupTemplate) === null || _a === void 0 ? void 0 : _a.title);
+        if (popupTitle.includes("{expression/expr") && ((_b = layer === null || layer === void 0 ? void 0 : layer.popupTemplate) === null || _b === void 0 ? void 0 : _b.expressionInfos) != null) {
+            for (let i = 0; i < ((_c = layer.popupTemplate) === null || _c === void 0 ? void 0 : _c.expressionInfos.length); i++) {
+                const info = layer.popupTemplate.expressionInfos[i];
+                const profile = {
+                    variables: [
+                        {
+                            name: "$feature",
+                            type: "feature"
+                        }
+                    ]
+                };
+                try {
+                    const arcadeExecutor = await this.arcade.createArcadeExecutor(info.expression, profile);
+                    const arcadeTitle = arcadeExecutor.execute({ $feature: graphic });
+                    if (arcadeTitle != null || arcadeTitle !== "") {
+                        attributes[`{expression/${info.name}}`.toUpperCase()] = arcadeTitle;
+                    }
+                }
+                catch (_d) {
+                    continue;
+                }
+            }
+        }
+        return popupTitle === null || popupTitle === void 0 ? void 0 : popupTitle.replace(/{.*?}/g, (placeholder) => {
+            return attributes[placeholder.toUpperCase()] != null ? attributes[placeholder.toUpperCase()] : "";
+        });
+    }
+    /**
+     * Remove any tags from the title
+     *
+     * @returns title string without tags
+     *
+     * @protected
+     */
+    _removeTags(str) {
+        if (str == null || str === "") {
+            return "";
+        }
+        return str.toString().replace(/(<([^>]+)>)/gi, "");
+    }
+    /**
+     * Load esri javascript api modules
+     *
+     * @returns Promise resolving when function is done
+     *
+     * @protected
+     */
+    async _initModules() {
+        const [arcade] = await loadModules([
+            "esri/arcade"
+        ]);
+        this.arcade = arcade;
+    }
+}

package/dist/collection/utils/popupUtils.ts

@@ -0,0 +1,104 @@
+/** @license
+ * Copyright 2022 Esri
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*    http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+import { loadModules } from "./loadModules";
+
+export class PopupUtils {
+
+	/**
+	 * esri/arcade: https://developers.arcgis.com/javascript/latest/api-reference/esri-arcade.html
+	 */
+	arcade: typeof import("esri/arcade");
+
+  /**
+   * Get the popup title that honors arcade expressions
+   *
+   * @returns Promise resolving with the popup title
+   *
+   * @protected
+   */
+	public async getPopupTitle(
+		graphic: __esri.Graphic
+	): Promise<string> {
+		if (!this.arcade) {
+			await this._initModules()
+		}
+		let attributes = {};
+		for (const [key, value] of Object.entries(graphic.attributes)) {
+			attributes = {
+				...attributes,
+				[`{${key.toUpperCase()}}`]: value
+			};
+		}
+		const layer = graphic.layer as __esri.FeatureLayer;
+		const popupTitle = this._removeTags(layer?.popupTemplate?.title as string);
+		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];
+				const profile = {
+					variables: [
+						{
+							name: "$feature",
+							type: "feature"
+						}
+					]
+				} as __esri.Profile;
+				try {
+					const arcadeExecutor = await this.arcade.createArcadeExecutor(info.expression, profile);
+					const arcadeTitle = arcadeExecutor.execute({ $feature: graphic });
+					if (arcadeTitle != null || arcadeTitle !== "") {
+						attributes[`{expression/${info.name}}`.toUpperCase()] = arcadeTitle;
+					}
+				} catch {
+					continue;
+				}
+			}
+		}
+
+		return popupTitle?.replace(/{.*?}/g, (placeholder: string) => {
+			return attributes[placeholder.toUpperCase()] != null ? (attributes[placeholder.toUpperCase()] as string) : "";
+		});
+	}
+
+  /**
+   * Remove any tags from the title
+   *
+   * @returns title string without tags
+   *
+   * @protected
+   */
+	protected _removeTags(str: string): string {
+		if (str == null || str === "") {
+			return "";
+		}
+		return str.toString().replace(/(<([^>]+)>)/gi, "");
+	}
+
+  /**
+   * Load esri javascript api modules
+   *
+   * @returns Promise resolving when function is done
+   *
+   * @protected
+   */
+	protected async _initModules(): Promise<void> {
+		const [arcade] = await loadModules([
+			"esri/arcade"
+		]);
+		this.arcade = arcade;
+	}
+
+}

package/dist/collection/utils/queryUtils.js

@@ -102,7 +102,7 @@ export async function queryObjectIds(geometries, layer) {
  *
  * @returns Promise with the featureSet from the layer that match the provided ids
  */
-export async function queryFeaturesByID(ids, layer, graphics, returnGeometry, outSpatialReference) {
+export async function queryFeaturesByID(ids, layer, graphics, returnGeometry, outSpatialReference, fields) {
     var _a;
     const num = (_a = layer.capabilities) === null || _a === void 0 ? void 0 : _a.query.maxRecordCount;
     const start = 0;
@@ -116,6 +116,9 @@ export async function queryFeaturesByID(ids, layer, graphics, returnGeometry, ou
     if (outSpatialReference) {
         q.outSpatialReference = outSpatialReference;
     }
+    if (fields) {
+        q.outFields = fields;
+    }
     const result = await layer.queryFeatures(q);
     graphics = graphics.concat(result.features);
     const remainingIds = ids.slice(num, ids.length);

package/dist/collection/utils/queryUtils.ts

@@ -126,7 +126,8 @@ export async function queryFeaturesByID(
   layer: __esri.FeatureLayer,
   graphics: __esri.Graphic[],
   returnGeometry: boolean,
-  outSpatialReference?: __esri.SpatialReference
+  outSpatialReference?: __esri.SpatialReference,
+  fields?: string[]
 ): Promise<__esri.Graphic[]> {
   const num = layer.capabilities?.query.maxRecordCount;
   const start = 0;
@@ -141,6 +142,9 @@ export async function queryFeaturesByID(
   if (outSpatialReference) {
     q.outSpatialReference = outSpatialReference;
   }
+  if (fields) {
+    q.outFields = fields;
+  }
 
   const result = await layer.queryFeatures(q);