@esri/solutions-components 0.6.37 → 0.6.38

package/dist/collection/utils/downloadUtils.js

@@ -23,7 +23,7 @@ import { exportCSV } from "./csvUtils";
 import { exportPDF } from "./pdfUtils";
 import { loadModules } from "./loadModules";
 import { queryFeaturesByID } from "./queryUtils";
-//import * as common from "@esri/solution-common";
+import * as common from "@esri/solution-common";
 export { ILabel } from "./pdfUtils";
 const lineSeparatorChar = "|";
 import { queryRelated } from "@esri/arcgis-rest-feature-layer";
@@ -427,13 +427,55 @@ export async function _getLabelFormat(webmap, layer, formatUsingLayerPopup) {
       const labelFormatType = (_b = (_a = layer.popupTemplate) === null || _a === void 0 ? void 0 : _a.content[0]) === null || _b === void 0 ? void 0 : _b.type;
       if (labelFormatType === "relationship") {
         const relationshipId = layer.popupTemplate.content[0].relationshipId;
-        const webmapLayers = webmap.layers.toArray().concat(webmap.tables.toArray())
-          .filter((entry) => entry.type === "feature"
-          && entry.id !== layer.id
-          && entry.relationships
-          && entry.relationships.some(relationship => relationship.id === relationshipId));
-        labelFormatProps = await _getLabelFormat(webmap, webmapLayers[0], formatUsingLayerPopup);
-        labelFormatProps.relationshipId = relationshipId;
+        // Get related layer
+        let webmapLayers = webmap.layers.toArray().concat(webmap.tables.toArray());
+        webmapLayers = webmapLayers.filter((webmapLayer) => webmapLayer.type === "feature"
+          && webmapLayer.id !== layer.id
+          && webmapLayer.relationships
+          && webmapLayer.relationships.some(relationship => relationship.id === relationshipId));
+        if (webmapLayers.length > 0) {
+          labelFormatProps = await _getLabelFormat(webmap, webmapLayers[0], formatUsingLayerPopup);
+          labelFormatProps.relationshipId = relationshipId;
+        }
+        else {
+          // Related layer info is not in webmap; get the label info from the related layer
+          webmapLayers = webmap.layers.toArray().concat(webmap.tables.toArray());
+          // Keep only feature layers and tables that have the type "feature" and whose layerId doesn't
+          // match the one we entered this function with and who have a URL that we can query
+          const relationshipCandidatePromises = [];
+          webmapLayers = webmapLayers.filter((webmapLayer) => {
+            if (webmapLayer.type === "feature" && webmapLayer.layerId != layer.layerId && webmapLayer.url) {
+              // Query the feature layer/table for properties missing from the webmap version
+              const webmapLayerUrl = webmapLayer.url + "/" + webmapLayer.layerId.toString();
+              relationshipCandidatePromises.push(common.getJson(webmapLayerUrl /*, authentication*/));
+              return true;
+            }
+            else {
+              return false;
+            }
+          });
+          // Of the queried feature layers/tables, find the one with the matching relationship id
+          const relationshipCandidates = await Promise.all(relationshipCandidatePromises);
+          let labelFormatPropsPromise;
+          if (!relationshipCandidates.some((candidateLayer, i) => {
+            if (candidateLayer.relationships
+              && candidateLayer.relationships.some(relationship => relationship.id === relationshipId)) {
+              // Found the matching relationship; get the label format from it
+              labelFormatPropsPromise = _getLabelFormat(webmap, webmapLayers[i], formatUsingLayerPopup);
+              return true;
+            }
+            else {
+              return false;
+            }
+          })) {
+            // Fallback to all fields
+            labelFormatProps.labelFormat = _convertPopupFieldsToLabelSpec(layer.popupTemplate.fieldInfos);
+          }
+          else {
+            labelFormatProps = await labelFormatPropsPromise;
+            labelFormatProps.relationshipId = relationshipId;
+          }
+        }
       }
       else if (labelFormatType === "fields") {
         labelFormatProps.labelFormat = _convertPopupFieldsToLabelSpec(layer.popupTemplate.fieldInfos);

package/dist/collection/utils/downloadUtils.ts

@@ -21,7 +21,7 @@ import { ILabel, exportPDF } from "./pdfUtils";
 import { loadModules } from "./loadModules";
 import { queryFeaturesByID } from "./queryUtils";
 import { IExportInfo, IExportInfos } from "../utils/interfaces";
-//import * as common from "@esri/solution-common";
+import * as common from "@esri/solution-common";
 
 export { ILabel } from "./pdfUtils";
 
@@ -584,15 +584,68 @@ export async function _getLabelFormat(
       if (labelFormatType === "relationship") {
         const relationshipId = layer.popupTemplate.content[0].relationshipId;
 
-        const webmapLayers = webmap.layers.toArray().concat(webmap.tables.toArray())
-        .filter((entry: __esri.FeatureLayer) =>
-          entry.type === "feature"
-          && entry.id !== layer.id
-          && entry.relationships
-          && entry.relationships.some(relationship => relationship.id === relationshipId));
+        // Get related layer
+        let webmapLayers = webmap.layers.toArray().concat(webmap.tables.toArray()) as  __esri.FeatureLayer[];
+        webmapLayers = webmapLayers.filter(
+          (webmapLayer: __esri.FeatureLayer) =>
+            webmapLayer.type === "feature"
+            && webmapLayer.id !== layer.id
+            && webmapLayer.relationships
+            && webmapLayer.relationships.some(relationship => relationship.id === relationshipId)
+          );
 
-        labelFormatProps = await _getLabelFormat(webmap, webmapLayers[0] as __esri.FeatureLayer, formatUsingLayerPopup);
-        labelFormatProps.relationshipId = relationshipId;
+        if (webmapLayers.length > 0) {
+          labelFormatProps = await _getLabelFormat(webmap, webmapLayers[0], formatUsingLayerPopup);
+          labelFormatProps.relationshipId = relationshipId;
+
+        } else {
+          // Related layer info is not in webmap; get the label info from the related layer
+          webmapLayers = webmap.layers.toArray().concat(webmap.tables.toArray()) as  __esri.FeatureLayer[];
+
+          // Keep only feature layers and tables that have the type "feature" and whose layerId doesn't
+          // match the one we entered this function with and who have a URL that we can query
+          const relationshipCandidatePromises: Promise<any>[] = [];
+          webmapLayers = webmapLayers.filter(
+            (webmapLayer: __esri.FeatureLayer) => {
+              if (webmapLayer.type === "feature" && webmapLayer.layerId != layer.layerId && webmapLayer.url) {
+                // Query the feature layer/table for properties missing from the webmap version
+                const webmapLayerUrl = webmapLayer.url + "/" + webmapLayer.layerId.toString();
+                relationshipCandidatePromises.push(
+                  common.getJson(webmapLayerUrl/*, authentication*/)
+                );
+                return true;
+              } else {
+                return false;
+              }
+            }
+          )
+
+          // Of the queried feature layers/tables, find the one with the matching relationship id
+          const relationshipCandidates = await Promise.all(relationshipCandidatePromises);
+          let labelFormatPropsPromise: Promise<ILabelFormatProps>;
+          if (
+            !relationshipCandidates.some(
+              (candidateLayer: any, i: number) => {
+                if (
+                  candidateLayer.relationships
+                  && candidateLayer.relationships.some(relationship => relationship.id === relationshipId)
+                ) {
+                  // Found the matching relationship; get the label format from it
+                  labelFormatPropsPromise = _getLabelFormat(webmap, webmapLayers[i], formatUsingLayerPopup);
+                  return true;
+                } else {
+                  return false;
+                }
+              }
+            )
+          ) {
+            // Fallback to all fields
+            labelFormatProps.labelFormat = _convertPopupFieldsToLabelSpec(layer.popupTemplate.fieldInfos);
+          } else {
+            labelFormatProps = await labelFormatPropsPromise;
+            labelFormatProps.relationshipId = relationshipId;
+          }
+        }
 
       } else if (labelFormatType === "fields") {
         labelFormatProps.labelFormat = _convertPopupFieldsToLabelSpec(layer.popupTemplate.fieldInfos);

package/dist/collection/utils/queryUtils.js

@@ -103,13 +103,16 @@ 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) {
-  const num = layer.capabilities.query.maxRecordCount;
+  var _a;
+  const num = (_a = layer.capabilities) === null || _a === void 0 ? void 0 : _a.query.maxRecordCount;
   const start = 0;
   const q = layer.createQuery();
   q.start = start;
-  q.num = num;
   q.returnGeometry = returnGeometry;
   q.objectIds = ids.slice(start, num);
+  if (num) {
+    q.num = num;
+  }
   if (outSpatialReference) {
     q.outSpatialReference = outSpatialReference;
   }

package/dist/collection/utils/queryUtils.ts

@@ -128,14 +128,16 @@ export async function queryFeaturesByID(
   returnGeometry: boolean,
   outSpatialReference?: __esri.SpatialReference
 ): Promise<__esri.Graphic[]> {
-  const num = layer.capabilities.query.maxRecordCount;
+  const num = layer.capabilities?.query.maxRecordCount;
   const start = 0;
 
   const q = layer.createQuery();
   q.start = start;
-  q.num = num;
   q.returnGeometry = returnGeometry;
   q.objectIds = ids.slice(start, num);
+  if (num) {
+    q.num = num;
+  }
   if (outSpatialReference) {
     q.outSpatialReference = outSpatialReference;
   }

package/dist/components/downloadUtils.js

@@ -7,7 +7,8 @@ import { c as createCommonjsModule, g as getDefaultExportFromCjs } from './_comm
 import { getAssetPath } from '@stencil/core/internal/client';
 import { l as loadModules } from './loadModules.js';
 import { q as queryFeaturesByID } from './queryUtils.js';
-import { _ as __assign$1, r as request, c as cleanUrl } from './clean-url.js';
+import './solution-resource.js';
+import { _ as __assign$1, r as request, c as cleanUrl, g as getJson } from './restHelpersGet.js';
 
 /** @license
  * Copyright 2022 Esri
@@ -2742,13 +2743,55 @@ async function _getLabelFormat(webmap, layer, formatUsingLayerPopup) {
       const labelFormatType = (_b = (_a = layer.popupTemplate) === null || _a === void 0 ? void 0 : _a.content[0]) === null || _b === void 0 ? void 0 : _b.type;
       if (labelFormatType === "relationship") {
         const relationshipId = layer.popupTemplate.content[0].relationshipId;
-        const webmapLayers = webmap.layers.toArray().concat(webmap.tables.toArray())
-          .filter((entry) => entry.type === "feature"
-          && entry.id !== layer.id
-          && entry.relationships
-          && entry.relationships.some(relationship => relationship.id === relationshipId));
-        labelFormatProps = await _getLabelFormat(webmap, webmapLayers[0], formatUsingLayerPopup);
-        labelFormatProps.relationshipId = relationshipId;
+        // Get related layer
+        let webmapLayers = webmap.layers.toArray().concat(webmap.tables.toArray());
+        webmapLayers = webmapLayers.filter((webmapLayer) => webmapLayer.type === "feature"
+          && webmapLayer.id !== layer.id
+          && webmapLayer.relationships
+          && webmapLayer.relationships.some(relationship => relationship.id === relationshipId));
+        if (webmapLayers.length > 0) {
+          labelFormatProps = await _getLabelFormat(webmap, webmapLayers[0], formatUsingLayerPopup);
+          labelFormatProps.relationshipId = relationshipId;
+        }
+        else {
+          // Related layer info is not in webmap; get the label info from the related layer
+          webmapLayers = webmap.layers.toArray().concat(webmap.tables.toArray());
+          // Keep only feature layers and tables that have the type "feature" and whose layerId doesn't
+          // match the one we entered this function with and who have a URL that we can query
+          const relationshipCandidatePromises = [];
+          webmapLayers = webmapLayers.filter((webmapLayer) => {
+            if (webmapLayer.type === "feature" && webmapLayer.layerId != layer.layerId && webmapLayer.url) {
+              // Query the feature layer/table for properties missing from the webmap version
+              const webmapLayerUrl = webmapLayer.url + "/" + webmapLayer.layerId.toString();
+              relationshipCandidatePromises.push(getJson(webmapLayerUrl /*, authentication*/));
+              return true;
+            }
+            else {
+              return false;
+            }
+          });
+          // Of the queried feature layers/tables, find the one with the matching relationship id
+          const relationshipCandidates = await Promise.all(relationshipCandidatePromises);
+          let labelFormatPropsPromise;
+          if (!relationshipCandidates.some((candidateLayer, i) => {
+            if (candidateLayer.relationships
+              && candidateLayer.relationships.some(relationship => relationship.id === relationshipId)) {
+              // Found the matching relationship; get the label format from it
+              labelFormatPropsPromise = _getLabelFormat(webmap, webmapLayers[i], formatUsingLayerPopup);
+              return true;
+            }
+            else {
+              return false;
+            }
+          })) {
+            // Fallback to all fields
+            labelFormatProps.labelFormat = _convertPopupFieldsToLabelSpec(layer.popupTemplate.fieldInfos);
+          }
+          else {
+            labelFormatProps = await labelFormatPropsPromise;
+            labelFormatProps.relationshipId = relationshipId;
+          }
+        }
       }
       else if (labelFormatType === "fields") {
         labelFormatProps.labelFormat = _convertPopupFieldsToLabelSpec(layer.popupTemplate.fieldInfos);

package/dist/components/public-notification.js

@@ -80,7 +80,7 @@ const PublicNotification$1 = /*@__PURE__*/ proxyCustomElement(class PublicNotifi
     this.defaultBufferDistance = undefined;
     this.defaultBufferUnit = undefined;
     this.defaultExportTitle = "";
-    this.defaultNumLabelsPerPage = undefined;
+    this.defaultNumLabelsPerPage = 6;
     this.featureEffect = undefined;
     this.featureHighlightEnabled = undefined;
     this.mapView = undefined;
@@ -901,7 +901,7 @@ const PublicNotification$1 = /*@__PURE__*/ proxyCustomElement(class PublicNotifi
     "defaultBufferDistance": [2, "default-buffer-distance"],
     "defaultBufferUnit": [1, "default-buffer-unit"],
     "defaultExportTitle": [1, "default-export-title"],
-    "defaultNumLabelsPerPage": [8, "default-num-labels-per-page"],
+    "defaultNumLabelsPerPage": [2, "default-num-labels-per-page"],
     "featureEffect": [16],
     "featureHighlightEnabled": [4, "feature-highlight-enabled"],
     "mapView": [16],

package/dist/components/queryUtils.js

@@ -60,13 +60,16 @@ async function queryObjectIds(geometries, layer) {
  * @returns Promise with the featureSet from the layer that match the provided ids
  */
 async function queryFeaturesByID(ids, layer, graphics, returnGeometry, outSpatialReference) {
-  const num = layer.capabilities.query.maxRecordCount;
+  var _a;
+  const num = (_a = layer.capabilities) === null || _a === void 0 ? void 0 : _a.query.maxRecordCount;
   const start = 0;
   const q = layer.createQuery();
   q.start = start;
-  q.num = num;
   q.returnGeometry = returnGeometry;
   q.objectIds = ids.slice(start, num);
+  if (num) {
+    q.num = num;
+  }
   if (outSpatialReference) {
     q.outSpatialReference = outSpatialReference;
   }