@esri/solutions-components 0.5.7 → 0.5.8

package/dist/cjs/calcite-input-text_5.cjs.entry.js

@@ -24,7 +24,7 @@ const mapViewUtils = require('./mapViewUtils-c45571b9.js');
 const interfaces = require('./interfaces-842c84a1.js');
 const publicNotificationStore = require('./publicNotificationStore-cd1a32c3.js');
 const locale$1 = require('./locale-b113c6b2.js');
-const downloadUtils = require('./downloadUtils-06876768.js');
+const downloadUtils = require('./downloadUtils-8d66f03e.js');
 require('./guid-c58d5ead.js');
 require('./key-d55baa11.js');
 require('./index-e1b1954f.js');

package/dist/cjs/{downloadUtils-06876768.js → downloadUtils-8d66f03e.js}

@@ -1507,7 +1507,7 @@ function(t){var e=function(t){for(var e=t.length,r=new Uint8Array(e),n=0;n<e;n++
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * ====================================================================
  */
-function(t){function e(){return (n.canvg?Promise.resolve(n.canvg):Promise.resolve().then(function () { return require('./index.es-d07646b4.js'); })).catch((function(t){return Promise.reject(new Error("Could not load canvg: "+t))})).then((function(t){return t.default?t.default:t}))}E.API.addSvgAsImage=function(t,r,n,i,o,s,c,u){if(isNaN(r)||isNaN(n))throw a.error("jsPDF.addSvgAsImage: Invalid coordinates",arguments),new Error("Invalid coordinates passed to jsPDF.addSvgAsImage");if(isNaN(i)||isNaN(o))throw a.error("jsPDF.addSvgAsImage: Invalid measurements",arguments),new Error("Invalid measurements (width and/or height) passed to jsPDF.addSvgAsImage");var h=document.createElement("canvas");h.width=i,h.height=o;var l=h.getContext("2d");l.fillStyle="#fff",l.fillRect(0,0,h.width,h.height);var f={ignoreMouse:!0,ignoreAnimation:!0,ignoreDimensions:!0},d=this;return e().then((function(e){return e.fromString(l,t,f)}),(function(){return Promise.reject(new Error("Could not load canvg."))})).then((function(t){return t.render(f)})).then((function(){d.addImage(h.toDataURL("image/jpeg",1),r,n,i,o,c,u);}))};}(),E.API.putTotalPages=function(t){var e,r=0;parseInt(this.internal.getFont().id.substr(1),10)<15?(e=new RegExp(t,"g"),r=this.internal.getNumberOfPages()):(e=new RegExp(this.pdfEscape16(t,this.internal.getFont()),"g"),r=this.pdfEscape16(this.internal.getNumberOfPages()+"",this.internal.getFont()));for(var n=1;n<=this.internal.getNumberOfPages();n++)for(var i=0;i<this.internal.pages[n].length;i++)this.internal.pages[n][i]=this.internal.pages[n][i].replace(e,r);return this},E.API.viewerPreferences=function(e,r){var n;e=e||{},r=r||!1;var i,a,o,s={HideToolbar:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},HideMenubar:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},HideWindowUI:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},FitWindow:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},CenterWindow:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},DisplayDocTitle:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.4},NonFullScreenPageMode:{defaultValue:"UseNone",value:"UseNone",type:"name",explicitSet:!1,valueSet:["UseNone","UseOutlines","UseThumbs","UseOC"],pdfVersion:1.3},Direction:{defaultValue:"L2R",value:"L2R",type:"name",explicitSet:!1,valueSet:["L2R","R2L"],pdfVersion:1.3},ViewArea:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},ViewClip:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},PrintArea:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},PrintClip:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},PrintScaling:{defaultValue:"AppDefault",value:"AppDefault",type:"name",explicitSet:!1,valueSet:["AppDefault","None"],pdfVersion:1.6},Duplex:{defaultValue:"",value:"none",type:"name",explicitSet:!1,valueSet:["Simplex","DuplexFlipShortEdge","DuplexFlipLongEdge","none"],pdfVersion:1.7},PickTrayByPDFSize:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.7},PrintPageRange:{defaultValue:"",value:"",type:"array",explicitSet:!1,valueSet:null,pdfVersion:1.7},NumCopies:{defaultValue:1,value:1,type:"integer",explicitSet:!1,valueSet:null,pdfVersion:1.7}},c=Object.keys(s),u=[],h=0,l=0,f=0;function d(t,e){var r,n=!1;for(r=0;r<t.length;r+=1)t[r]===e&&(n=!0);return n}if(void 0===this.internal.viewerpreferences&&(this.internal.viewerpreferences={},this.internal.viewerpreferences.configuration=JSON.parse(JSON.stringify(s)),this.internal.viewerpreferences.isSubscribed=!1),n=this.internal.viewerpreferences.configuration,"reset"===e||!0===r){var p=c.length;for(f=0;f<p;f+=1)n[c[f]].value=n[c[f]].defaultValue,n[c[f]].explicitSet=!1;}if("object"===t(e))for(a in e)if(o=e[a],d(c,a)&&void 0!==o){if("boolean"===n[a].type&&"boolean"==typeof o)n[a].value=o;else if("name"===n[a].type&&d(n[a].valueSet,o))n[a].value=o;else if("integer"===n[a].type&&Number.isInteger(o))n[a].value=o;else if("array"===n[a].type){for(h=0;h<o.length;h+=1)if(i=!0,1===o[h].length&&"number"==typeof o[h][0])u.push(String(o[h]-1));else if(o[h].length>1){for(l=0;l<o[h].length;l+=1)"number"!=typeof o[h][l]&&(i=!1);!0===i&&u.push([o[h][0]-1,o[h][1]-1].join(" "));}n[a].value="["+u.join(" ")+"]";}else n[a].value=n[a].defaultValue;n[a].explicitSet=!0;}return !1===this.internal.viewerpreferences.isSubscribed&&(this.internal.events.subscribe("putCatalog",(function(){var t,e=[];for(t in n)!0===n[t].explicitSet&&("name"===n[t].type?e.push("/"+t+" /"+n[t].value):e.push("/"+t+" "+n[t].value));0!==e.length&&this.internal.write("/ViewerPreferences\n<<\n"+e.join("\n")+"\n>>");})),this.internal.viewerpreferences.isSubscribed=!0),this.internal.viewerpreferences.configuration=n,this},
+function(t){function e(){return (n.canvg?Promise.resolve(n.canvg):Promise.resolve().then(function () { return require('./index.es-4f5dfcc6.js'); })).catch((function(t){return Promise.reject(new Error("Could not load canvg: "+t))})).then((function(t){return t.default?t.default:t}))}E.API.addSvgAsImage=function(t,r,n,i,o,s,c,u){if(isNaN(r)||isNaN(n))throw a.error("jsPDF.addSvgAsImage: Invalid coordinates",arguments),new Error("Invalid coordinates passed to jsPDF.addSvgAsImage");if(isNaN(i)||isNaN(o))throw a.error("jsPDF.addSvgAsImage: Invalid measurements",arguments),new Error("Invalid measurements (width and/or height) passed to jsPDF.addSvgAsImage");var h=document.createElement("canvas");h.width=i,h.height=o;var l=h.getContext("2d");l.fillStyle="#fff",l.fillRect(0,0,h.width,h.height);var f={ignoreMouse:!0,ignoreAnimation:!0,ignoreDimensions:!0},d=this;return e().then((function(e){return e.fromString(l,t,f)}),(function(){return Promise.reject(new Error("Could not load canvg."))})).then((function(t){return t.render(f)})).then((function(){d.addImage(h.toDataURL("image/jpeg",1),r,n,i,o,c,u);}))};}(),E.API.putTotalPages=function(t){var e,r=0;parseInt(this.internal.getFont().id.substr(1),10)<15?(e=new RegExp(t,"g"),r=this.internal.getNumberOfPages()):(e=new RegExp(this.pdfEscape16(t,this.internal.getFont()),"g"),r=this.pdfEscape16(this.internal.getNumberOfPages()+"",this.internal.getFont()));for(var n=1;n<=this.internal.getNumberOfPages();n++)for(var i=0;i<this.internal.pages[n].length;i++)this.internal.pages[n][i]=this.internal.pages[n][i].replace(e,r);return this},E.API.viewerPreferences=function(e,r){var n;e=e||{},r=r||!1;var i,a,o,s={HideToolbar:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},HideMenubar:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},HideWindowUI:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},FitWindow:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},CenterWindow:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},DisplayDocTitle:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.4},NonFullScreenPageMode:{defaultValue:"UseNone",value:"UseNone",type:"name",explicitSet:!1,valueSet:["UseNone","UseOutlines","UseThumbs","UseOC"],pdfVersion:1.3},Direction:{defaultValue:"L2R",value:"L2R",type:"name",explicitSet:!1,valueSet:["L2R","R2L"],pdfVersion:1.3},ViewArea:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},ViewClip:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},PrintArea:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},PrintClip:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},PrintScaling:{defaultValue:"AppDefault",value:"AppDefault",type:"name",explicitSet:!1,valueSet:["AppDefault","None"],pdfVersion:1.6},Duplex:{defaultValue:"",value:"none",type:"name",explicitSet:!1,valueSet:["Simplex","DuplexFlipShortEdge","DuplexFlipLongEdge","none"],pdfVersion:1.7},PickTrayByPDFSize:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.7},PrintPageRange:{defaultValue:"",value:"",type:"array",explicitSet:!1,valueSet:null,pdfVersion:1.7},NumCopies:{defaultValue:1,value:1,type:"integer",explicitSet:!1,valueSet:null,pdfVersion:1.7}},c=Object.keys(s),u=[],h=0,l=0,f=0;function d(t,e){var r,n=!1;for(r=0;r<t.length;r+=1)t[r]===e&&(n=!0);return n}if(void 0===this.internal.viewerpreferences&&(this.internal.viewerpreferences={},this.internal.viewerpreferences.configuration=JSON.parse(JSON.stringify(s)),this.internal.viewerpreferences.isSubscribed=!1),n=this.internal.viewerpreferences.configuration,"reset"===e||!0===r){var p=c.length;for(f=0;f<p;f+=1)n[c[f]].value=n[c[f]].defaultValue,n[c[f]].explicitSet=!1;}if("object"===t(e))for(a in e)if(o=e[a],d(c,a)&&void 0!==o){if("boolean"===n[a].type&&"boolean"==typeof o)n[a].value=o;else if("name"===n[a].type&&d(n[a].valueSet,o))n[a].value=o;else if("integer"===n[a].type&&Number.isInteger(o))n[a].value=o;else if("array"===n[a].type){for(h=0;h<o.length;h+=1)if(i=!0,1===o[h].length&&"number"==typeof o[h][0])u.push(String(o[h]-1));else if(o[h].length>1){for(l=0;l<o[h].length;l+=1)"number"!=typeof o[h][l]&&(i=!1);!0===i&&u.push([o[h][0]-1,o[h][1]-1].join(" "));}n[a].value="["+u.join(" ")+"]";}else n[a].value=n[a].defaultValue;n[a].explicitSet=!0;}return !1===this.internal.viewerpreferences.isSubscribed&&(this.internal.events.subscribe("putCatalog",(function(){var t,e=[];for(t in n)!0===n[t].explicitSet&&("name"===n[t].type?e.push("/"+t+" /"+n[t].value):e.push("/"+t+" "+n[t].value));0!==e.length&&this.internal.write("/ViewerPreferences\n<<\n"+e.join("\n")+"\n>>");})),this.internal.viewerpreferences.isSubscribed=!0),this.internal.viewerpreferences.configuration=n,this},
 /** ====================================================================
  * @license
  * jsPDF XMP metadata plugin
@@ -2427,6 +2427,38 @@ function _createFilename(selectionSetNames) {
   const title = selectionSetNames.length > 0 ? selectionSetNames.join(", ") : "download";
   return title;
 }
+/**
+ * Creates relationship queries for each relationship flag in a popup.
+ * @param layer Layer whose popup is to be examined
+ * @return Hash of relationships by their id, or null if there are no relationship flags in the
+ * popup; each relationship has the properties layer and relatedQuery for the related layer
+ * and the query for that layer
+ */
+function _createRelationshipQueries(layer) {
+  const relationships = {};
+  const relationshipFieldPattern = /\{relationships\/\d+\//gm;
+  const relationshipIdPattern = /\d+/;
+  // Test if this popup has any relationship references
+  const matches = layer.popupTemplate.content[0].text.match(relationshipFieldPattern);
+  if (matches) {
+    matches.forEach(match => {
+      // Add a query to a found relationship if we don't already have one
+      const id = match.match(relationshipIdPattern)[0];
+      if (!relationships.hasOwnProperty(id)) {
+        const relatedQuery = {
+          outFields: ['*'],
+          relationshipId: id,
+          returnGeometry: false
+        };
+        relationships[id] = {
+          layer,
+          relatedQuery
+        };
+      }
+    });
+  }
+  return relationships;
+}
 /**
  * Prepares an attribute's value by applying domain and type information.
  *
@@ -2487,7 +2519,7 @@ function _prepareAttributeValue(attributeValue, attributeType, attributeDomain,
  * @returns Promise resolving when function is done
  */
 async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLayerPopup = true, includeHeaderNames = false) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const [intl] = await loadModules.loadModules(["esri/intl"]);
   // Get the features to export
   const featureSet = await mapViewUtils.queryFeaturesByID(ids, layer);
@@ -2501,6 +2533,7 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
   const attributeFormats = {};
   // Get the label formatting, if any
   let labelFormat;
+  let relationshipQueries = {};
   let arcadeExecutors = {};
   if (layer.popupEnabled) {
     layer.popupTemplate.fieldInfos.forEach(
@@ -2529,6 +2562,8 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
     }
     else if (formatUsingLayerPopup && ((_d = (_c = layer.popupTemplate) === null || _c === void 0 ? void 0 : _c.content[0]) === null || _d === void 0 ? void 0 : _d.type) === "text") {
       labelFormat = _convertPopupTextToLabelSpec(layer.popupTemplate.content[0].text);
+      // Do we need any relationship queries?
+      relationshipQueries = _createRelationshipQueries(layer);
       // Do we need any Arcade executors?
       arcadeExecutors = await _createArcadeExecutors(labelFormat, layer);
     }
@@ -2537,36 +2572,75 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
   let labels;
   // eslint-disable-next-line unicorn/prefer-ternary
   if (labelFormat) {
+    console.log("labelFormat", labelFormat); //???
     const arcadeExpressionRegExp = /\{expression\/\w+\}/g;
     const attributeRegExp = /\{\w+\}/g;
     // Find the label fields that we need to replace with values
-    const arcadeExpressionMatches = labelFormat.match(arcadeExpressionRegExp);
-    const attributeMatches = labelFormat.match(attributeRegExp);
+    const arcadeExpressionMatches = (_e = labelFormat.match(arcadeExpressionRegExp)) !== null && _e !== void 0 ? _e : [];
+    const attributeMatches = (_f = labelFormat.match(attributeRegExp)) !== null && _f !== void 0 ? _f : [];
     // Convert feature attributes into an array of labels
-    labels = featureSet.features.map(feature => {
+    const relationshipKeys = Object.keys(relationshipQueries);
+    labels = await Promise.all(featureSet.features.map(async (feature) => {
       let labelPrep = labelFormat;
-      // Replace Arcade expressions
-      if (arcadeExpressionMatches) {
-        arcadeExpressionMatches.forEach((match) => {
-          const expressionName = match.substring(match.indexOf("/") + 1, match.length - 1);
-          const value = arcadeExecutors[expressionName].execute({ "$feature": feature });
-          labelPrep = labelPrep.replace(match, value);
-        });
-      }
-      // Replace non-Arcade fields
-      if (attributeMatches) {
-        attributeMatches.forEach((match) => {
-          const attributeName = match.substring(1, match.length - 1);
-          const value = _prepareAttributeValue(feature.attributes[attributeName], attributeTypes[attributeName], attributeDomains[attributeName], attributeFormats[attributeName], intl);
-          labelPrep = labelPrep.replace(match, value);
+      // Replace Arcade expressions in this feature
+      arcadeExpressionMatches.forEach((match) => {
+        const expressionName = match.substring(match.indexOf("/") + 1, match.length - 1);
+        const value = arcadeExecutors[expressionName].execute({ "$feature": feature });
+        labelPrep = labelPrep.replace(match, value);
+      });
+      // Replace relationship expressions in this feature
+      const relatedFeatureQueries = [];
+      const relationshipIds = [];
+      relationshipKeys.forEach((relationshipId) => {
+        const relationship = relationshipQueries[relationshipId];
+        const objectId = feature.attributes[relationship.layer.objectIdField];
+        const relatedQuery = Object.assign(Object.assign({}, relationship.relatedQuery), { objectIds: [objectId] });
+        relatedFeatureQueries.push(relationship.layer.queryRelatedFeatures(relatedQuery));
+        relationshipIds.push(relationshipId);
+      });
+      // Wait for all of the queries for related records for this label
+      const relatedFeatureQueryResults = await Promise.all(relatedFeatureQueries);
+      console.log("relatedFeatureQueryResults", relatedFeatureQueryResults); //???
+      relatedFeatureQueryResults.forEach((relatedFeatureQueryResult, i) => {
+        // We have an object with FeatureSets grouped by source layer or table objectIds
+        const relationshipId = relationshipIds[i];
+        console.log("relationshipId", relationshipId); //???
+        console.log("relatedFeatureQueryResult", relatedFeatureQueryResult); //???
+        // Run through the source layer or table objectIds
+        Object.keys(relatedFeatureQueryResult).forEach(relatedFeatureSetId => {
+          console.log("relatedFeatureSetId", relatedFeatureSetId); //???
+          // We have a feature set
+          const relatedFeatures = relatedFeatureQueryResult[relatedFeatureSetId].features;
+          console.log("relatedFeatures", relatedFeatures); //???
+          // Get the values from each feature and replace them in the label
+          relatedFeatures.forEach(feature => {
+            // Merge the base and related feature attributes and create the label
+            // Prefix related feature's attributes with "relationships/<id>/" to match popup
+            const rePrefix = "\{relationships/" + relationshipId + "/";
+            const reSuffix = "\}";
+            console.log("/rePrefix + attributeName + reSuffix/g", rePrefix + "attributeName" + reSuffix); //???
+            const attributes = feature.attributes;
+            Object.keys(attributes).forEach(attributeName => {
+              console.log("/rePrefix + attributeName + reSuffix/g", rePrefix + attributeName + reSuffix); //???
+              // Replace the value using the attribute name as a relationship
+              const attributeRelationshipRegExp = new RegExp(rePrefix + attributeName + reSuffix, "g");
+              labelPrep = labelPrep.replaceAll(attributeRelationshipRegExp, attributes[attributeName]);
+            });
+          });
         });
-      }
+      });
+      // Replace non-Arcade fields in this feature
+      attributeMatches.forEach((match) => {
+        const attributeName = match.substring(1, match.length - 1);
+        const value = _prepareAttributeValue(feature.attributes[attributeName], attributeTypes[attributeName], attributeDomains[attributeName], attributeFormats[attributeName], intl);
+        labelPrep = labelPrep.replace(match, value);
+      });
       // Split label into lines
       let label = labelPrep.split(lineSeparatorChar);
       // Trim lines
       label = label.map(line => line.trim());
       return label;
-    });
+    }));
   }
   else {
     // Export all attributes

package/dist/cjs/{index.es-d07646b4.js → index.es-4f5dfcc6.js}

@@ -6,7 +6,7 @@
 'use strict';
 
 const _commonjsHelpers = require('./_commonjsHelpers-384729db.js');
-const downloadUtils = require('./downloadUtils-06876768.js');
+const downloadUtils = require('./downloadUtils-8d66f03e.js');
 require('./index-6654298b.js');
 require('./loadModules-ae7715f2.js');
 require('./locale-b113c6b2.js');

package/dist/cjs/layer-table_2.cjs.entry.js

@@ -11,7 +11,7 @@ const index = require('./index-6654298b.js');
 const loadModules = require('./loadModules-ae7715f2.js');
 const locale = require('./locale-b113c6b2.js');
 const mapViewUtils = require('./mapViewUtils-c45571b9.js');
-const downloadUtils = require('./downloadUtils-06876768.js');
+const downloadUtils = require('./downloadUtils-8d66f03e.js');
 const interfaces = require('./interfaces-842c84a1.js');
 require('./_commonjsHelpers-384729db.js');
 

package/dist/collection/components/refine-selection/refine-selection.css

@@ -1,86 +1,86 @@
-/** @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.
- */
-
-:host {
-  display: block;
-}
-
-.div-visible {
-  display: inherit;
-}
-
-.div-not-visible {
-  display: none !important;
-}
-
-.padding-top-1-2 {
-  padding-top: .5rem;
-}
-
-.main-label {
-  display: flex;
-  float: left;
-}
-
-html[dir="rtl"] .main-label {
-  display: flex;
-  float: right;
-}
-
-.border {
-  outline: 1px solid var(--calcite-ui-border-input);
-}
-
-.margin-top-1 {
-  margin-top: 1rem;
-}
-
-/* COPY FROM JS */
-.esri-sketch {
-  display: flex;
-  flex-flow: column wrap;
-}
-
-.esri-widget {
-  box-sizing: border-box;
-  color: #323232;
-  font-size: 14px;
-  font-family: "Avenir Next","Helvetica Neue",Helvetica,Arial,sans-serif;
-  line-height: 1.3em;
-  background-color: var(--calcite-ui-foreground-1);
-}
-
-/* DIV CHILD */
-.esri-sketch__panel {
-  align-items: center;
-  display: flex;
-  flex-flow: row nowrap;
-  padding: 0;
-} */
-
-/* DIV CHILD CHILD */
-.esri-sketch__tool-section {
-  border-right: 1px solid rgba(110,110,110,.3);
-}
-
-.esri-sketch__section {
-  align-items: center;
-  display: flex;
-  flex-flow: row nowrap;
-  padding: 0 7px;
-  margin: 6px 0;
-  border-right: 1px solid rgba(110,110,110,.3);
+/** @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.
+ */
+
+:host {
+  display: block;
+}
+
+.div-visible {
+  display: inherit;
+}
+
+.div-not-visible {
+  display: none !important;
+}
+
+.padding-top-1-2 {
+  padding-top: .5rem;
+}
+
+.main-label {
+  display: flex;
+  float: left;
+}
+
+html[dir="rtl"] .main-label {
+  display: flex;
+  float: right;
+}
+
+.border {
+  outline: 1px solid var(--calcite-ui-border-input);
+}
+
+.margin-top-1 {
+  margin-top: 1rem;
+}
+
+/* COPY FROM JS */
+.esri-sketch {
+  display: flex;
+  flex-flow: column wrap;
+}
+
+.esri-widget {
+  box-sizing: border-box;
+  color: #323232;
+  font-size: 14px;
+  font-family: "Avenir Next","Helvetica Neue",Helvetica,Arial,sans-serif;
+  line-height: 1.3em;
+  background-color: var(--calcite-ui-foreground-1);
+}
+
+/* DIV CHILD */
+.esri-sketch__panel {
+  align-items: center;
+  display: flex;
+  flex-flow: row nowrap;
+  padding: 0;
+} */
+
+/* DIV CHILD CHILD */
+.esri-sketch__tool-section {
+  border-right: 1px solid rgba(110,110,110,.3);
+}
+
+.esri-sketch__section {
+  align-items: center;
+  display: flex;
+  flex-flow: row nowrap;
+  padding: 0 7px;
+  margin: 6px 0;
+  border-right: 1px solid rgba(110,110,110,.3);
 }

package/dist/collection/utils/downloadUtils.js

@@ -196,6 +196,38 @@ export function _createFilename(selectionSetNames) {
   const title = selectionSetNames.length > 0 ? selectionSetNames.join(", ") : "download";
   return title;
 }
+/**
+ * Creates relationship queries for each relationship flag in a popup.
+ * @param layer Layer whose popup is to be examined
+ * @return Hash of relationships by their id, or null if there are no relationship flags in the
+ * popup; each relationship has the properties layer and relatedQuery for the related layer
+ * and the query for that layer
+ */
+export function _createRelationshipQueries(layer) {
+  const relationships = {};
+  const relationshipFieldPattern = /\{relationships\/\d+\//gm;
+  const relationshipIdPattern = /\d+/;
+  // Test if this popup has any relationship references
+  const matches = layer.popupTemplate.content[0].text.match(relationshipFieldPattern);
+  if (matches) {
+    matches.forEach(match => {
+      // Add a query to a found relationship if we don't already have one
+      const id = match.match(relationshipIdPattern)[0];
+      if (!relationships.hasOwnProperty(id)) {
+        const relatedQuery = {
+          outFields: ['*'],
+          relationshipId: id,
+          returnGeometry: false
+        };
+        relationships[id] = {
+          layer,
+          relatedQuery
+        };
+      }
+    });
+  }
+  return relationships;
+}
 /**
  * Prepares an attribute's value by applying domain and type information.
  *
@@ -256,7 +288,7 @@ function _prepareAttributeValue(attributeValue, attributeType, attributeDomain,
  * @returns Promise resolving when function is done
  */
 async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLayerPopup = true, includeHeaderNames = false) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const [intl] = await loadModules(["esri/intl"]);
   // Get the features to export
   const featureSet = await queryFeaturesByID(ids, layer);
@@ -270,6 +302,7 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
   const attributeFormats = {};
   // Get the label formatting, if any
   let labelFormat;
+  let relationshipQueries = {};
   let arcadeExecutors = {};
   if (layer.popupEnabled) {
     layer.popupTemplate.fieldInfos.forEach(
@@ -298,6 +331,8 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
     }
     else if (formatUsingLayerPopup && ((_d = (_c = layer.popupTemplate) === null || _c === void 0 ? void 0 : _c.content[0]) === null || _d === void 0 ? void 0 : _d.type) === "text") {
       labelFormat = _convertPopupTextToLabelSpec(layer.popupTemplate.content[0].text);
+      // Do we need any relationship queries?
+      relationshipQueries = _createRelationshipQueries(layer);
       // Do we need any Arcade executors?
       arcadeExecutors = await _createArcadeExecutors(labelFormat, layer);
     }
@@ -306,36 +341,75 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
   let labels;
   // eslint-disable-next-line unicorn/prefer-ternary
   if (labelFormat) {
+    console.log("labelFormat", labelFormat); //???
     const arcadeExpressionRegExp = /\{expression\/\w+\}/g;
     const attributeRegExp = /\{\w+\}/g;
     // Find the label fields that we need to replace with values
-    const arcadeExpressionMatches = labelFormat.match(arcadeExpressionRegExp);
-    const attributeMatches = labelFormat.match(attributeRegExp);
+    const arcadeExpressionMatches = (_e = labelFormat.match(arcadeExpressionRegExp)) !== null && _e !== void 0 ? _e : [];
+    const attributeMatches = (_f = labelFormat.match(attributeRegExp)) !== null && _f !== void 0 ? _f : [];
     // Convert feature attributes into an array of labels
-    labels = featureSet.features.map(feature => {
+    const relationshipKeys = Object.keys(relationshipQueries);
+    labels = await Promise.all(featureSet.features.map(async (feature) => {
       let labelPrep = labelFormat;
-      // Replace Arcade expressions
-      if (arcadeExpressionMatches) {
-        arcadeExpressionMatches.forEach((match) => {
-          const expressionName = match.substring(match.indexOf("/") + 1, match.length - 1);
-          const value = arcadeExecutors[expressionName].execute({ "$feature": feature });
-          labelPrep = labelPrep.replace(match, value);
-        });
-      }
-      // Replace non-Arcade fields
-      if (attributeMatches) {
-        attributeMatches.forEach((match) => {
-          const attributeName = match.substring(1, match.length - 1);
-          const value = _prepareAttributeValue(feature.attributes[attributeName], attributeTypes[attributeName], attributeDomains[attributeName], attributeFormats[attributeName], intl);
-          labelPrep = labelPrep.replace(match, value);
+      // Replace Arcade expressions in this feature
+      arcadeExpressionMatches.forEach((match) => {
+        const expressionName = match.substring(match.indexOf("/") + 1, match.length - 1);
+        const value = arcadeExecutors[expressionName].execute({ "$feature": feature });
+        labelPrep = labelPrep.replace(match, value);
+      });
+      // Replace relationship expressions in this feature
+      const relatedFeatureQueries = [];
+      const relationshipIds = [];
+      relationshipKeys.forEach((relationshipId) => {
+        const relationship = relationshipQueries[relationshipId];
+        const objectId = feature.attributes[relationship.layer.objectIdField];
+        const relatedQuery = Object.assign(Object.assign({}, relationship.relatedQuery), { objectIds: [objectId] });
+        relatedFeatureQueries.push(relationship.layer.queryRelatedFeatures(relatedQuery));
+        relationshipIds.push(relationshipId);
+      });
+      // Wait for all of the queries for related records for this label
+      const relatedFeatureQueryResults = await Promise.all(relatedFeatureQueries);
+      console.log("relatedFeatureQueryResults", relatedFeatureQueryResults); //???
+      relatedFeatureQueryResults.forEach((relatedFeatureQueryResult, i) => {
+        // We have an object with FeatureSets grouped by source layer or table objectIds
+        const relationshipId = relationshipIds[i];
+        console.log("relationshipId", relationshipId); //???
+        console.log("relatedFeatureQueryResult", relatedFeatureQueryResult); //???
+        // Run through the source layer or table objectIds
+        Object.keys(relatedFeatureQueryResult).forEach(relatedFeatureSetId => {
+          console.log("relatedFeatureSetId", relatedFeatureSetId); //???
+          // We have a feature set
+          const relatedFeatures = relatedFeatureQueryResult[relatedFeatureSetId].features;
+          console.log("relatedFeatures", relatedFeatures); //???
+          // Get the values from each feature and replace them in the label
+          relatedFeatures.forEach(feature => {
+            // Merge the base and related feature attributes and create the label
+            // Prefix related feature's attributes with "relationships/<id>/" to match popup
+            const rePrefix = "\{relationships/" + relationshipId + "/";
+            const reSuffix = "\}";
+            console.log("/rePrefix + attributeName + reSuffix/g", rePrefix + "attributeName" + reSuffix); //???
+            const attributes = feature.attributes;
+            Object.keys(attributes).forEach(attributeName => {
+              console.log("/rePrefix + attributeName + reSuffix/g", rePrefix + attributeName + reSuffix); //???
+              // Replace the value using the attribute name as a relationship
+              const attributeRelationshipRegExp = new RegExp(rePrefix + attributeName + reSuffix, "g");
+              labelPrep = labelPrep.replaceAll(attributeRelationshipRegExp, attributes[attributeName]);
+            });
+          });
         });
-      }
+      });
+      // Replace non-Arcade fields in this feature
+      attributeMatches.forEach((match) => {
+        const attributeName = match.substring(1, match.length - 1);
+        const value = _prepareAttributeValue(feature.attributes[attributeName], attributeTypes[attributeName], attributeDomains[attributeName], attributeFormats[attributeName], intl);
+        labelPrep = labelPrep.replace(match, value);
+      });
       // Split label into lines
       let label = labelPrep.split(lineSeparatorChar);
       // Trim lines
       label = label.map(line => line.trim());
       return label;
-    });
+    }));
   }
   else {
     // Export all attributes