@esri/solutions-components 0.6.45 → 0.7.0

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

@@ -25,7 +25,6 @@ import * as common from "@esri/solution-common";
 
 export { ILabel } from "./pdfUtils";
 
-/*
 interface IArcadeExecutors {
   [expressionName: string]: __esri.ArcadeExecutor;
 }
@@ -33,7 +32,6 @@ interface IArcadeExecutors {
 interface IArcadeExecutorPromises {
   [expressionName: string]: Promise<__esri.ArcadeExecutor>;
 }
-*/
 
 export interface IAttributeOrigNames {
   [lowercaseName: string]: string;
@@ -381,7 +379,6 @@ export async function _convertPopupArcadeToLabelSpec(
  * @param layer Layer from which to fetch features
  * @return Promise resolving to a set of executors keyed using the expression name
  */
-/*
 async function _createArcadeExecutors(
   labelFormat: string,
   layer: __esri.FeatureLayer
@@ -453,7 +450,6 @@ async function _createArcadeExecutors(
     }
   );
 }
-*/
 
 /**
  * Creates a title from a list of selection set names.
@@ -944,7 +940,7 @@ export async function _prepareLabels(
   const labels
     = labelFormatProps.labelFormat.type === "pattern" ?
     // Export attributes in format
-    await _prepareLabelsFromPattern(/*layer,*/ featureSet, attributeOrigNames, attributeTypes, attributeDomains,
+    await _prepareLabelsFromPattern(layer, featureSet, attributeOrigNames, attributeTypes, attributeDomains,
       labelFormatProps.attributeFormats, labelFormatProps.labelFormat.format as string, includeHeaderNames)
 
     : labelFormatProps.labelFormat.type === "executor" ?
@@ -1015,7 +1011,7 @@ export async function _prepareLabelsFromAll(
  * @returns Promise resolving with list of labels, each of which is a list of label lines
  */
 export async function _prepareLabelsFromPattern(
-  //layer: __esri.FeatureLayer,
+  layer: __esri.FeatureLayer,
   featureSet: __esri.Graphic[],
   attributeOrigNames: IAttributeOrigNames,
   attributeTypes: IAttributeTypes,
@@ -1031,26 +1027,24 @@ export async function _prepareLabelsFromPattern(
   const attributeNames = _getFieldNamesFromFieldExpressions(attributeExpressionMatches);
 
   // Do we need any Arcade executors?
-  //const arcadeExecutors = await _createArcadeExecutors(labelFormat, layer);
-  //const arcadeExpressionRegExp = /\{expression\/\w+\}/g;
+  const arcadeExecutors = await _createArcadeExecutors(labelFormat, layer);
+  const arcadeExpressionRegExp = /\{expression\/\w+\}/g;
 
   // Find the label fields that we need to replace with values
-  //const arcadeExpressionMatches = labelFormat.match(arcadeExpressionRegExp) ?? [];
+  const arcadeExpressionMatches = labelFormat.match(arcadeExpressionRegExp) ?? [];
 
   // Convert feature attributes into an array of labels
   const labels = await Promise.all(featureSet.map(
     async feature => {
       let labelPrep = labelFormat;
 
-      /*
-      // Replace Arcade expressions in this feature
+      //Replace Arcade expressions in this feature
       for (let i = 0; i < arcadeExpressionMatches.length; i++) {
         const match: string = arcadeExpressionMatches[i];
         const expressionName = match.substring(match.indexOf("/") + 1, match.length - 1);
-        const value = await arcadeExecutors[expressionName].executeAsync({"$feature": feature, "$layer", layer});
+        const value = await arcadeExecutors[expressionName].executeAsync({"$feature": feature, "$layer": layer});
         labelPrep = labelPrep.replace(match, value);
       }
-      */
 
       // Replace non-Arcade fields in this feature
       const attributeValues = feature.attributes ?? feature;

package/dist/types/utils/downloadUtils.d.ts

@@ -142,14 +142,6 @@ export declare function _convertPopupTextToLabelSpec(popupInfo: string): ILabelF
  * @return Promise resolving to an "executor" label spec
  */
 export declare function _convertPopupArcadeToLabelSpec(expressionInfo: __esri.ElementExpressionInfo): Promise<ILabelFormat>;
-/**
- * Extracts Arcade expressions from the lines of a label format and creates an Arcade executor for each
- * referenced expression name.
- *
- * @param labelFormat Label to examine
- * @param layer Layer from which to fetch features
- * @return Promise resolving to a set of executors keyed using the expression name
- */
 /**
  * Creates a title from a list of selection set names.
  *
@@ -261,7 +253,7 @@ export declare function _prepareLabelsFromAll(featureSet: __esri.Graphic[], attr
  * @param includeHeaderNames Add the label format at the front of the list of generated labels
  * @returns Promise resolving with list of labels, each of which is a list of label lines
  */
-export declare function _prepareLabelsFromPattern(featureSet: __esri.Graphic[], attributeOrigNames: IAttributeOrigNames, attributeTypes: IAttributeTypes, attributeDomains: IAttributeDomains, attributeFormats: IAttributeFormats, labelFormat: string, includeHeaderNames?: boolean): Promise<string[][]>;
+export declare function _prepareLabelsFromPattern(layer: __esri.FeatureLayer, featureSet: __esri.Graphic[], attributeOrigNames: IAttributeOrigNames, attributeTypes: IAttributeTypes, attributeDomains: IAttributeDomains, attributeFormats: IAttributeFormats, labelFormat: string, includeHeaderNames?: boolean): Promise<string[][]>;
 /**
  * Creates labels from attributes in an Arcade label.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esri/solutions-components",
-  "version": "0.6.45",
+  "version": "0.7.0",
   "description": "Web Components for Esri's Solutions Applications",
   "main": "dist/index.cjs.js",
   "module": "dist/index.js",