@esri/solutions-components 0.7.20 → 0.7.22

package/dist/components/layer-table2.js

@@ -63,6 +63,10 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
          * boolean: When true the ctrl key is currently pressed
          */
         this._ctrlIsPressed = false;
+        /**
+         * boolean: When true the default filter provided via url param has been honored and should now be ignored
+         */
+        this._defaultFilterHonored = false;
         /**
          * boolean: When true the default global id provided via url param has been honored and should now be ignored
          */
@@ -96,8 +100,9 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
         this.onTableNodeCreate = (node) => {
             this._tableNode = node;
         };
-        this.defaultLayerId = undefined;
+        this.defaultFilter = undefined;
         this.defaultGlobalId = undefined;
+        this.defaultLayerId = undefined;
         this.defaultOid = undefined;
         this.enableAutoRefresh = undefined;
         this.enableColumnReorder = true;
@@ -467,93 +472,95 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
         const featuresSelected = this._featuresSelected();
         const featuresEmpty = this._featuresEmpty();
         const hasFilterExpressions = this._hasFilterExpressions();
-        this._toolInfos = [{
-                active: false,
-                icon: "zoom-to-object",
-                indicator: false,
-                label: this._translations.zoom,
-                func: () => this._zoom(),
-                disabled: !featuresSelected,
-                isOverflow: false
-            },
-            hasFilterExpressions ? {
-                active: false,
-                icon: "filter",
-                indicator: false,
-                label: this._translations.filters,
-                func: () => this._toggleFilter(),
-                disabled: false,
-                isOverflow: false
-            } : undefined,
-            this._deleteEnabled ? {
-                active: false,
-                icon: "trash",
-                indicator: false,
-                label: this._translations.delete,
-                func: () => this._delete(),
-                disabled: !featuresSelected,
-                isDanger: true,
-                isOverflow: false
-            } : undefined, {
-                active: false,
-                icon: "erase",
-                indicator: false,
-                label: this._translations.clearSelection,
-                func: () => this._clearSelection(),
-                disabled: !featuresSelected,
-                isOverflow: false
-            }, {
-                active: false,
-                icon: "selected-items-filter",
-                indicator: false,
-                label: this._showOnlySelected ? this._translations.showAll : this._translations.showSelected,
-                func: () => this._toggleShowSelected(),
-                disabled: !featuresSelected,
-                isOverflow: false
-            }, {
-                active: false,
-                icon: "list-check-all",
-                indicator: false,
-                func: () => this._selectAll(),
-                label: this._translations.selectAll,
-                disabled: featuresEmpty,
-                isOverflow: false
-            }, {
-                active: false,
-                icon: "compare",
-                indicator: false,
-                func: () => this._switchSelected(),
-                label: this._translations.switchSelected,
-                disabled: featuresEmpty,
-                isOverflow: false
-            }, {
-                active: false,
-                icon: "refresh",
-                indicator: false,
-                func: () => this._refresh(),
-                label: this._translations.refresh,
-                disabled: false,
-                isOverflow: false
-            },
-            this.enableCSV ? {
-                active: false,
-                icon: "export",
-                indicator: false,
-                func: () => void this._exportToCSV(),
-                label: this._translations.exportCSV,
-                disabled: featuresEmpty,
-                isOverflow: false
-            } : undefined, {
-                active: false,
-                icon: this._showHideOpen ? "chevron-down" : "chevron-right",
-                indicator: false,
-                func: () => this._toggleShowHide(),
-                label: this._translations.showHideColumns,
-                disabled: false,
-                isOverflow: false,
-                isSublist: true
-            }];
-        this._defaultVisibleToolSizeInfos = undefined;
+        if (this._translations) {
+            this._toolInfos = [{
+                    active: false,
+                    icon: "zoom-to-object",
+                    indicator: false,
+                    label: this._translations.zoom,
+                    func: () => this._zoom(),
+                    disabled: !featuresSelected,
+                    isOverflow: false
+                },
+                hasFilterExpressions ? {
+                    active: false,
+                    icon: "filter",
+                    indicator: false,
+                    label: this._translations.filters,
+                    func: () => this._toggleFilter(),
+                    disabled: false,
+                    isOverflow: false
+                } : undefined,
+                this._deleteEnabled ? {
+                    active: false,
+                    icon: "trash",
+                    indicator: false,
+                    label: this._translations.delete,
+                    func: () => this._delete(),
+                    disabled: !featuresSelected,
+                    isDanger: true,
+                    isOverflow: false
+                } : undefined, {
+                    active: false,
+                    icon: "erase",
+                    indicator: false,
+                    label: this._translations.clearSelection,
+                    func: () => this._clearSelection(),
+                    disabled: !featuresSelected,
+                    isOverflow: false
+                }, {
+                    active: false,
+                    icon: "selected-items-filter",
+                    indicator: false,
+                    label: this._showOnlySelected ? this._translations.showAll : this._translations.showSelected,
+                    func: () => this._toggleShowSelected(),
+                    disabled: !featuresSelected,
+                    isOverflow: false
+                }, {
+                    active: false,
+                    icon: "list-check-all",
+                    indicator: false,
+                    func: () => this._selectAll(),
+                    label: this._translations.selectAll,
+                    disabled: featuresEmpty,
+                    isOverflow: false
+                }, {
+                    active: false,
+                    icon: "compare",
+                    indicator: false,
+                    func: () => this._switchSelected(),
+                    label: this._translations.switchSelected,
+                    disabled: featuresEmpty,
+                    isOverflow: false
+                }, {
+                    active: false,
+                    icon: "refresh",
+                    indicator: false,
+                    func: () => this._refresh(),
+                    label: this._translations.refresh,
+                    disabled: false,
+                    isOverflow: false
+                },
+                this.enableCSV ? {
+                    active: false,
+                    icon: "export",
+                    indicator: false,
+                    func: () => void this._exportToCSV(),
+                    label: this._translations.exportCSV,
+                    disabled: featuresEmpty,
+                    isOverflow: false
+                } : undefined, {
+                    active: false,
+                    icon: this._showHideOpen ? "chevron-down" : "chevron-right",
+                    indicator: false,
+                    func: () => this._toggleShowHide(),
+                    label: this._translations.showHideColumns,
+                    disabled: false,
+                    isOverflow: false,
+                    isSublist: true
+                }];
+            this._defaultVisibleToolSizeInfos = undefined;
+        }
     }
     /**
      * Returns true when one ore more features are selected
@@ -764,13 +771,39 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
         if ((_b = this.mapInfo) === null || _b === void 0 ? void 0 : _b.id) {
             urlObj.searchParams.set("webmap", this.mapInfo.id);
         }
+        else {
+            urlObj.searchParams.delete("webmap");
+        }
         if ((_c = this._layer) === null || _c === void 0 ? void 0 : _c.id) {
             urlObj.searchParams.set("layer", this._layer.id);
         }
+        else {
+            urlObj.searchParams.delete("layer");
+        }
         if (((_d = this._selectedIndexes) === null || _d === void 0 ? void 0 : _d.length) > 0) {
             urlObj.searchParams.set("oid", this._selectedIndexes.join(","));
         }
+        else {
+            urlObj.searchParams.delete("oid");
+        }
+        if (this._filterActive) {
+            const filter = JSON.parse(this._filterList.urlParams.get("filter"));
+            const layerExpressions = this._filterList.layerExpressions.map(layerExp => {
+                layerExp.expressions = layerExp.expressions.map(exp => {
+                    if (exp.id.toString() === filter.expressionId.toString()) {
+                        exp.active = true;
+                    }
+                    return exp;
+                });
+                return layerExp;
+            });
+            urlObj.searchParams.set("filter", JSON.stringify(layerExpressions));
+        }
+        else {
+            urlObj.searchParams.delete("filter");
+        }
         this._shareNode.shareUrl = urlObj.href;
+        history.pushState(history.state, document.title, urlObj.href);
     }
     /**
      * Get a tooltip
@@ -891,7 +924,8 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
                     const _end = this._table.viewModel.getObjectIdIndex(this._currentId);
                     const startIndex = _start < _end ? _start : _end;
                     const endIndex = _end > _start ? _end : _start;
-                    this._selectedIndexes = oids.reduce((prev, cur) => {
+                    this._skipOnChange = startIndex + 1 !== endIndex;
+                    const selectedIndexes = oids.reduce((prev, cur) => {
                         const id = cur;
                         const index = this._table.viewModel.getObjectIdIndex(id);
                         if ((id === this._currentId || id === this._previousCurrentId)) {
@@ -913,6 +947,7 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
                         }
                         return prev;
                     }, []);
+                    this._selectedIndexes = _start < _end ? selectedIndexes.reverse() : selectedIndexes;
                     this._table.highlightIds.addMany(this._selectedIndexes.filter(i => ids.indexOf(i) < 0));
                 }
             }
@@ -975,6 +1010,11 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
                 }
                 this._defaultGlobalIdHonored = true;
             }
+            if (!this._defaultFilterHonored && this.defaultFilter && this._filterList) {
+                this._layerExpressions = this.defaultFilter;
+                this._filterActive = true;
+                this._defaultFilterHonored = true;
+            }
         });
         this._showOnlySelected = false;
         this._sortActive = false;
@@ -1083,19 +1123,21 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
      */
     _filterModal() {
         var _a, _b, _c;
-        return (h("calcite-modal", { "aria-labelledby": "modal-title", class: "modal", kind: "brand", onCalciteModalClose: async () => this._closeFilter(), open: this._filterOpen, widthScale: "s" }, h("div", { class: "display-flex align-center", id: "modal-title", slot: "header" }, (_b = (_a = this._translations) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.replace("{{title}}", (_c = this._layer) === null || _c === void 0 ? void 0 : _c.title)), h("div", { slot: "content" }, h("instant-apps-filter-list", { autoUpdateUrl: false, closeBtn: true, closeBtnOnClick: async () => this._closeFilter(), layerExpressions: this._layerExpressions, onFilterListReset: () => this._handleFilterListReset(), onFilterUpdate: () => this._handleFilterUpdate(), ref: (el) => this._filterList = el, view: this.mapView, zoomBtn: false }))));
+        return (h("calcite-modal", { "aria-labelledby": "modal-title", class: "modal", kind: "brand", onCalciteModalClose: async () => this._closeFilter(), open: this._filterOpen, widthScale: "s" }, h("div", { class: "display-flex align-center", id: "modal-title", slot: "header" }, (_b = (_a = this._translations) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.replace("{{title}}", (_c = this._layer) === null || _c === void 0 ? void 0 : _c.title)), h("div", { slot: "content" }, h("instant-apps-filter-list", { autoUpdateUrl: true, closeBtn: true, closeBtnOnClick: async () => this._closeFilter(), layerExpressions: this._layerExpressions, onFilterListReset: () => this._handleFilterListReset(), onFilterUpdate: () => this._handleFilterUpdate(), ref: (el) => this._filterList = el, view: this.mapView, zoomBtn: false }))));
     }
     /**
      * Reset the filter active prop
      */
     _handleFilterListReset() {
         this._filterActive = false;
+        this._updateShareUrl();
     }
     /**
      * Check if the layers definitionExpression has been modified
      */
     _handleFilterUpdate() {
         this._filterActive = this._definitionExpression !== this._layer.definitionExpression;
+        this._updateShareUrl();
     }
     /**
      * Close the filter modal
@@ -1388,8 +1430,9 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
     }; }
     static get style() { return layerTableCss; }
 }, [0, "layer-table", {
-        "defaultLayerId": [1, "default-layer-id"],
+        "defaultFilter": [16],
         "defaultGlobalId": [16],
+        "defaultLayerId": [1, "default-layer-id"],
         "defaultOid": [16],
         "enableAutoRefresh": [4, "enable-auto-refresh"],
         "enableColumnReorder": [4, "enable-column-reorder"],

package/dist/components/public-notification.js

@@ -93,6 +93,7 @@ const PublicNotification$1 = /*@__PURE__*/ proxyCustomElement(class PublicNotifi
         this.sketchPointSymbol = undefined;
         this.sketchPolygonSymbol = undefined;
         this._addMap = false;
+        this._addResults = true;
         this._addTitle = false;
         this._downloadActive = true;
         this._exportType = EExportType.PDF;
@@ -531,7 +532,7 @@ const PublicNotification$1 = /*@__PURE__*/ proxyCustomElement(class PublicNotifi
     _getExportPage() {
         const hasSelections = this._hasSelections(this.showRefineSelection);
         const displayDuplicatesClass = this._numDuplicates > 0 ? "display-block" : "display-none";
-        return (h("calcite-panel", null, h("div", null, this._getLabel(this._translations.export, false), hasSelections ? (h("div", null, this._getNotice(this._translations.exportTip, "padding-sides-1"), this._getLabel(this._translations.exportListsLabel), this._getExportSelectionLists(), h("div", { class: "padding-sides-1 " + displayDuplicatesClass }, h("div", { class: "display-flex" }, h("calcite-label", { layout: "inline" }, h("calcite-checkbox", { ref: (el) => { this._removeDuplicates = el; } }), h("div", { class: "display-flex" }, this._translations.removeDuplicate, h("div", { class: "info-message padding-start-1-2" }, h("calcite-input-message", { class: "info-blue margin-top-0", scale: "m" }, ` ${this._translations.numDuplicates.replace("{{n}}", this._numDuplicates.toString())}`)))), h("calcite-icon", { class: "padding-start-1-2 icon", icon: "question", id: "remove-duplicates-icon", scale: "s" })), h("calcite-popover", { closable: true, label: "", referenceElement: "remove-duplicates-icon" }, h("span", { class: "tooltip-message" }, this._translations.duplicatesTip))), h("div", { class: "border-bottom" }), h("div", { class: "padding-top-sides-1" }, h("calcite-segmented-control", { class: "w-100", onCalciteSegmentedControlChange: (evt) => this._exportTypeChange(evt) }, h("calcite-segmented-control-item", { checked: this._exportType === EExportType.PDF, class: "w-50 end-border", value: EExportType.PDF }, h("span", { class: "font-weight-500" }, this._translations.pdf)), h("calcite-segmented-control-item", { checked: this._exportType === EExportType.CSV, class: "w-50", value: EExportType.CSV }, h("span", { class: "font-weight-500" }, this._translations.csv)))), h("div", { class: "padding-bottom-1" }, this._getExportOptions()), h("div", { class: "padding-1 display-flex" }, h("calcite-button", { disabled: !this._downloadActive || this._fetchingData, loading: this._fetchingData, onClick: () => void this._export(), width: "full" }, h("span", { class: "font-weight-500" }, this._translations.export))))) : (this._getNotice(this._translations.downloadNoLists, "padding-sides-1 padding-bottom-1")))));
+        return (h("calcite-panel", null, h("div", null, this._getLabel(this._translations.export, false), hasSelections ? (h("div", null, this._getNotice(this._translations.exportTip, "padding-sides-1"), this._getLabel(this._translations.exportListsLabel), this._getExportSelectionLists(), h("div", { class: "padding-sides-1 " + displayDuplicatesClass }, h("div", { class: "display-flex" }, h("calcite-label", { layout: "inline" }, h("calcite-checkbox", { ref: (el) => { this._removeDuplicates = el; } }), h("div", { class: "display-flex" }, this._translations.removeDuplicate, h("div", { class: "info-message padding-start-1-2" }, h("calcite-input-message", { class: "info-blue margin-top-0", scale: "m" }, ` ${this._translations.numDuplicates.replace("{{n}}", this._numDuplicates.toString())}`)))), h("calcite-icon", { class: "padding-start-1-2 icon", icon: "question", id: "remove-duplicates-icon", scale: "s" })), h("calcite-popover", { closable: true, label: "", referenceElement: "remove-duplicates-icon" }, h("span", { class: "tooltip-message" }, this._translations.duplicatesTip))), h("div", { class: "border-bottom" }), h("div", { class: "padding-top-sides-1" }, h("calcite-segmented-control", { class: "w-100", onCalciteSegmentedControlChange: (evt) => this._exportTypeChange(evt) }, h("calcite-segmented-control-item", { checked: this._exportType === EExportType.PDF, class: "w-50 end-border", value: EExportType.PDF }, h("span", { class: "font-weight-500" }, this._translations.pdf)), h("calcite-segmented-control-item", { checked: this._exportType === EExportType.CSV, class: "w-50", value: EExportType.CSV }, h("span", { class: "font-weight-500" }, this._translations.csv)))), h("div", { class: "padding-bottom-1" }, this._getExportOptions()), h("div", { class: "padding-1 display-flex" }, h("calcite-button", { disabled: (!this._downloadActive || this._fetchingData) || (!this._addMap && !this._addResults), loading: this._fetchingData, onClick: () => void this._export(), width: "full" }, h("span", { class: "font-weight-500" }, this._translations.export))))) : (this._getNotice(this._translations.downloadNoLists, "padding-sides-1 padding-bottom-1")))));
     }
     /**
      * Store the user selected export type CSV || PDF
@@ -550,7 +551,8 @@ const PublicNotification$1 = /*@__PURE__*/ proxyCustomElement(class PublicNotifi
         const displayClass = this._exportType === EExportType.PDF ? "display-block" : "display-none";
         const titleOptionsClass = this._addTitle ? "display-block" : "display-none";
         const title = this._titleValue ? this._titleValue : this.defaultExportTitle ? this.defaultExportTitle : "";
-        return (h("div", { class: displayClass }, this._getLabel(this._translations.pdfOptions, true), h("div", { class: "padding-top-sides-1" }, h("calcite-label", { class: "label-margin-0" }, this._translations.selectPDFLabelOption)), h("div", { class: "padding-sides-1" }, h("pdf-download", { defaultNumLabelsPerPage: parseInt(this.defaultNumLabelsPerPage.toString(), 10), disabled: !this._downloadActive, ref: (el) => { this._downloadTools = el; } })), h("div", { class: "padding-top-sides-1" }, h("calcite-label", { class: "label-margin-0", layout: "inline" }, h("calcite-checkbox", { checked: this._addTitle, onCalciteCheckboxChange: () => this._addTitle = !this._addTitle }), this._translations.addTitle)), h("div", { class: titleOptionsClass }, this._getLabel(this._translations.title, true, ""), h("calcite-input-text", { class: "padding-sides-1", onCalciteInputTextInput: () => this._changeTitle(), placeholder: this._translations.titlePlaceholder, ref: (el) => { this._titleElement = el; }, value: title })), h("div", { class: "padding-top-sides-1" }, h("calcite-label", { class: "label-margin-0", layout: "inline" }, h("calcite-checkbox", { checked: this._addMap, onCalciteCheckboxChange: () => this._addMap = !this._addMap }), this._translations.includeMap))));
+        const formatOptionsClass = this._addResults ? "" : "display-none";
+        return (h("div", { class: displayClass }, this._getLabel(this._translations.pdfOptions, true), h("div", { class: "padding-top-sides-1" }, h("calcite-label", { class: "label-margin-0", layout: "inline" }, h("calcite-checkbox", { checked: this._addResults, onCalciteCheckboxChange: () => this._addResults = !this._addResults }), this._translations.addResults)), h("div", { class: `padding-top-sides-1 ${formatOptionsClass}` }, h("calcite-label", { class: "label-margin-0" }, this._translations.selectPDFLabelOption)), h("div", { class: `padding-sides-1 ${formatOptionsClass}` }, h("pdf-download", { defaultNumLabelsPerPage: parseInt(this.defaultNumLabelsPerPage.toString(), 10), disabled: !this._downloadActive, ref: (el) => { this._downloadTools = el; } })), h("div", { class: "padding-top-sides-1" }, h("calcite-label", { class: "label-margin-0", layout: "inline" }, h("calcite-checkbox", { checked: this._addTitle, onCalciteCheckboxChange: () => this._addTitle = !this._addTitle }), this._translations.addTitle)), h("div", { class: titleOptionsClass }, this._getLabel(this._translations.title, true, ""), h("calcite-input-text", { class: "padding-sides-1", onCalciteInputTextInput: () => this._changeTitle(), placeholder: this._translations.titlePlaceholder, ref: (el) => { this._titleElement = el; }, value: title })), h("div", { class: "padding-top-sides-1" }, h("calcite-label", { class: "label-margin-0", layout: "inline" }, h("calcite-checkbox", { checked: this._addMap, onCalciteCheckboxChange: () => this._addMap = !this._addMap }), this._translations.includeMap))));
     }
     /**
      * Render the refine page
@@ -656,7 +658,8 @@ const PublicNotification$1 = /*@__PURE__*/ proxyCustomElement(class PublicNotifi
      * @protected
      */
     async _export() {
-        const exportInfos = this._getSelectionIdsAndViews(this._selectionSets, true);
+        const exportInfos = this._addResults ?
+            this._getSelectionIdsAndViews(this._selectionSets, true) : {};
         if (this._exportType === EExportType.PDF) {
             // Generate a map screenshot
             let initialImageDataUrl = "";
@@ -914,6 +917,7 @@ const PublicNotification$1 = /*@__PURE__*/ proxyCustomElement(class PublicNotifi
         "sketchPointSymbol": [8, "sketch-point-symbol"],
         "sketchPolygonSymbol": [8, "sketch-polygon-symbol"],
         "_addMap": [32],
+        "_addResults": [32],
         "_addTitle": [32],
         "_downloadActive": [32],
         "_exportType": [32],