@esri/solutions-components 0.10.41 → 0.10.43

package/dist/components/crowdsource-reporter.js

@@ -248,17 +248,17 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
      */
     _formElements = [];
     /**
-     * string[]: URL params set by using filters.
+     * string: Previous selected layer id
      */
-    _filterUrlParams;
+    _prevSelectedLayerId;
     /**
-     * FilterInitState: filter's init state
+     * ILayerExpression[]: current LayerExpressions based on the selected layer
      */
-    _filterInitState;
+    _currentLayerExpressions;
     /**
-     * string: Previous selected layer id
+     * { [key: string]: string }: definitionExpressions for each layer
      */
-    _prevSelectedLayerId;
+    _initDefExpressions;
     //--------------------------------------------------------------------------
     //
     //  Watch handlers
@@ -283,6 +283,7 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
      */
     async mapViewWatchHandler() {
         await this.mapView.when(async () => {
+            this.setInitExpressions();
             await this.setMapView();
         });
     }
@@ -361,15 +362,25 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
             this._layers = this.reportingOptions ? Object.keys(this.reportingOptions).filter((layerId) => {
                 return this.reportingOptions[layerId].visible;
             }) : [];
+            this.setInitExpressions();
             await this.setMapView();
         });
     }
+    /**
+    * StencilJS: Called before every render().
+    * Update the filter list's initial definition expressions when the filter list component is available
+    */
+    componentWillRender() {
+        if (this._flowItems.includes('filter-panel')) {
+            void this._filterList?.updateInitDefExpressions({ initDefExpressions: this._initDefExpressions });
+        }
+    }
     /**
      * Renders the component.
      */
     render() {
         const themeClass = this.theme === "dark" ? "calcite-mode-dark" : "calcite-mode-light";
-        return (h(Host, { key: 'fbe7fdc13c462e0fe155107ac784f03b3922d624' }, this._reportSubmitted && h("calcite-alert", { key: '9bcf7856ad01e7bc59142a862c50b9d84c443268', "auto-close": true, class: themeClass + " report-submitted-msg", icon: "check-circle", kind: "success", label: "", onCalciteAlertClose: () => { this._reportSubmitted = false; }, open: true, placement: "top" }, h("div", { key: '7b81a7c8b3d66159a790ab3d13be9f1b65a6202e', slot: "message" }, this.reportSubmittedMessage ? this.reportSubmittedMessage : this._translations.submitMsg)), this._featureCreationFailedErrorMsg && h("calcite-alert", { key: 'ee2f17e3326ef7c60fb2ee06ed313fd28cf7084a', "auto-close": true, class: themeClass, icon: "x-octagon", kind: "danger", label: "", onCalciteAlertClose: () => { this._featureCreationFailedErrorMsg = ""; }, open: true, placement: "top" }, h("div", { key: 'b356832ee6d4d16a84cdea0abb6b1c677f9ca1f6', slot: "title" }, this._translations.error), h("div", { key: '8aa16df1114b75b6a3e2a76de7fb5c7cbc5d3632', slot: "message" }, this._featureCreationFailedErrorMsg)), this._commentSubmitted && h("calcite-alert", { key: 'e99693c23ef18b62daf892fccaacbbfe2486702d', "auto-close": true, class: 'report-submitted ' + themeClass, icon: "check-circle", kind: "success", label: "", onCalciteAlertClose: () => { this._commentSubmitted = false; }, open: true, placement: "top" }, h("div", { key: '58ccda0d3782dbe70d346b973b7648f8ae4c8c8f', slot: "message" }, this.commentSubmittedMessage || this._translations.commentSubmittedMsg)), this._addingCommentFailed && h("calcite-alert", { key: 'e49e9e3b33df17dd90b3263bec6c17566f6f7b1b', "auto-close": true, class: themeClass, icon: "x-octagon", kind: "danger", label: "", onCalciteAlertClose: () => { this._addingCommentFailed = false; }, open: true, placement: "top" }, h("div", { key: 'cfb88dd323ead1398cd73849f68a9c2846ef9d14', slot: "title" }, this._translations.error), h("div", { key: 'b27e8983a74c8613e569400b7c7ad0b14d43f323', slot: "message" }, this._translations.addingCommentFailedMsg)), h("div", { key: '7ac3d49d6383d2a88e54d91fa00e2c81aa91a890' }, h("calcite-shell", { key: '709e673f4e9261b4283c7593926d605c8a049abd', "content-behind": true }, this._getReporter()))));
+        return (h(Host, { key: 'f1dd6d85210210a73fff30a5d98370da1834be7b' }, this._reportSubmitted && h("calcite-alert", { key: 'b84760fcbf4bfcf0f038be272f74eda97ce17bd9', "auto-close": true, class: themeClass + " report-submitted-msg", icon: "check-circle", kind: "success", label: "", onCalciteAlertClose: () => { this._reportSubmitted = false; }, open: true, placement: "top" }, h("div", { key: '27aa04dd8575ad27898f7848bc2733a03a33e70f', slot: "message" }, this.reportSubmittedMessage ? this.reportSubmittedMessage : this._translations.submitMsg)), this._featureCreationFailedErrorMsg && h("calcite-alert", { key: '3fc2721bed573ad10bbb1c81af126e2e8ca90b12', "auto-close": true, class: themeClass, icon: "x-octagon", kind: "danger", label: "", onCalciteAlertClose: () => { this._featureCreationFailedErrorMsg = ""; }, open: true, placement: "top" }, h("div", { key: '4993e5c5b52d650b094c2890d0e4516cc87ffb69', slot: "title" }, this._translations.error), h("div", { key: '272b17f4c0239d8b295d6f2c0c02f1ba236d840d', slot: "message" }, this._featureCreationFailedErrorMsg)), this._commentSubmitted && h("calcite-alert", { key: '5b9e1a2bd129888ec0764ad9b05e5056653d3c33', "auto-close": true, class: 'report-submitted ' + themeClass, icon: "check-circle", kind: "success", label: "", onCalciteAlertClose: () => { this._commentSubmitted = false; }, open: true, placement: "top" }, h("div", { key: 'bd428297f5fe85cbf7edc42c61c64c299d7954b7', slot: "message" }, this.commentSubmittedMessage || this._translations.commentSubmittedMsg)), this._addingCommentFailed && h("calcite-alert", { key: '2aa1927ca27f9ec15a16f8e68905a1cf203ef833', "auto-close": true, class: themeClass, icon: "x-octagon", kind: "danger", label: "", onCalciteAlertClose: () => { this._addingCommentFailed = false; }, open: true, placement: "top" }, h("div", { key: '4bff5fb03586edf0f9ea21649d1de4c34034e539', slot: "title" }, this._translations.error), h("div", { key: '7ea6c71dbbac15c2f43242ba00c9e461177051a1', slot: "message" }, this._translations.addingCommentFailedMsg)), h("div", { key: '3aa6bfc19a1e82ab90d2ab42aa9a577b3a2b6d8f' }, h("calcite-shell", { key: 'f27355d4f655c0a0931158f38f0be3eb28f6c4d4', "content-behind": true }, this._getReporter()))));
     }
     //--------------------------------------------------------------------------
     //
@@ -433,7 +444,6 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
                     break;
                 case "filter-panel":
                     renderLists.push(this.getFilterPanel());
-                    void this._restoreFilters();
                     break;
                 case "feature-details":
                     renderLists.push(this.getFeatureDetailsFlowItem());
@@ -480,20 +490,6 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
         return (h("calcite-popover", { autoClose: true, label: "", offsetDistance: 0, placement: this.isMobile ? "leading-start" : "bottom-start", pointerDisabled: true, referenceElement: "sort-popover" }, h("calcite-list", { "selection-mode": "single" }, h("calcite-list-item", { label: this._translations.sortNewest, onCalciteListItemSelect: () => { void this.sortOptionClick(this._selectedLayer.objectIdField, "desc", "sortNewest"); }, selected: this._updatedSortOption === "sortNewest", value: "sortNewest" }), h("calcite-list-item", { label: this._translations.sortOldest, onCalciteListItemSelect: () => { void this.sortOptionClick(this._selectedLayer.objectIdField, "asc", "sortOldest"); }, selected: this._updatedSortOption === "sortOldest", value: "sortOldest" }), canSortByVotes &&
             h(Fragment, null, h("calcite-list-item", { label: this._translations.sortHighestVoted, onCalciteListItemSelect: () => { void this.sortOptionClick(this.reportingOptions[this._selectedLayerId].likeField, "desc", "sortHighestVoted"); }, selected: this._updatedSortOption === "sortHighestVoted", value: "sortHighestVoted" }), h("calcite-list-item", { label: this._translations.sortLowestVoted, onCalciteListItemSelect: () => { void this.sortOptionClick(this.reportingOptions[this._selectedLayerId].likeField, "asc", "sortLowestVoted"); }, selected: this._updatedSortOption === "sortLowestVoted", value: "sortLowestVoted" })))));
     }
-    /**
-     * Restores the applied filters
-     * @protected
-     */
-    _restoreFilters() {
-        // call the restore function when instant-apps-filter-list is ready
-        setTimeout(() => {
-            const canRestoreFilter = this._filterList && this._filterUrlParams && this._filterInitState;
-            if (canRestoreFilter) {
-                void this._filterList.restoreFilters(this._filterUrlParams[0], this._filterInitState);
-            }
-            this._filterInitState = null;
-        }, 200);
-    }
     /**
      * Reset the filter
      * @protected
@@ -501,19 +497,14 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
     async _handleFilterListReset() {
         //on reset filter list reset the filter states
         this._filterActive = false;
-        this._filterUrlParams = null;
-        this._filterInitState = null;
     }
     /**
      * Check if the layers definitionExpression has been modified and update the feature list depending on the applied filters
      * @protected
      */
-    async _handleFilterUpdate() {
+    async _handleFilterUpdate(active) {
         this._showLoadingIndicator = true;
-        //if filter are applied the url params will be generated
-        //set the filter active state based on the length of applied filters
-        this._filterActive = this._filterList.urlParams.getAll('filter').length > 0;
-        this._filterUrlParams = this._filterList.urlParams.getAll('filter');
+        this._filterActive = active;
         await this._featureList.refresh();
         this._showLoadingIndicator = false;
     }
@@ -680,10 +671,6 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
         if (evt.detail.layerId && evt.detail.layerName) {
             await this.setSelectedLayer(evt.detail.layerId, evt.detail.layerName);
         }
-        // reset the applied filter when switching to another layer
-        if (this._selectedLayerId !== this._prevSelectedLayerId && this._filterActive) {
-            await this.resetFilter();
-        }
         void this.updateNonVisibleLayersOnMap(true);
         // get the form template elements to pass in create-feature to create a LEVELID field in feature-form
         this._getFormElements();
@@ -755,28 +742,18 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
         };
         this._updatedSortOption = "sortNewest";
         await this.setSelectedLayer(evt.detail.layerId, evt.detail.layerName);
+        void this.handleSelectedLayersFilter();
         this._flowItems = [...this._flowItems, "feature-list"];
-        // reset the applied filter when switching to another layer
-        if (this._selectedLayerId !== this._prevSelectedLayerId && this._filterActive) {
-            await this.resetFilter();
-        }
         this._prevSelectedLayerId = this._selectedLayerId;
     }
-    /**
-     * Reset's the applied filter
-     * @protected
-     */
-    async resetFilter() {
-        const prevLayer = await getLayerOrTable(this.mapView, this._prevSelectedLayerId);
-        prevLayer.definitionExpression = this._filterInitState.initDefExpressions[this._prevSelectedLayerId];
-        void this._handleFilterListReset();
-    }
     /**
      * On back from filter panel get the filter's init state
      * @protected
      */
     async backFromFilterPanel() {
-        this._filterInitState = await this._filterList.getFilterInitState();
+        if (this._filterList != null) {
+            this._currentLayerExpressions = await this._filterList.getCurrentLayerExpressions();
+        }
         await this._featureList.refresh();
         this.backFromSelectedPanel();
     }
@@ -891,9 +868,8 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
      * @protected
      */
     getFeatureListFlowItem(layerId, layerName) {
-        const layerExpressions = this.layerExpressions?.filter((exp) => exp.id === this._selectedLayerId);
         const canCreateReports = this._getLayersConfig(this._selectedLayerId)?.reporting && this._layerItemsHash[this._selectedLayerId].supportsAdd;
-        const showFilterIcon = layerExpressions?.length > 0;
+        const showFilterIcon = this._currentLayerExpressions?.length > 0;
         return (h("calcite-flow-item", { collapsed: this.isMobile && this._sidePanelCollapsed, heading: layerName, loading: this._showLoadingIndicator, onCalciteFlowItemBack: this.backFromSelectedPanel.bind(this) }, this._toggleSort(), h("calcite-action", { icon: "sort-ascending-arrow", id: "sort-popover", slot: "header-actions-end", text: this._translations.sort, title: this._translations.sort }), showFilterIcon && h("calcite-action", { icon: "filter", indicator: this._filterActive, onClick: () => { this._flowItems = [...this._flowItems, "filter-panel"]; }, slot: "header-actions-end", text: this._translations.filter, title: this._translations.filter }), this.isMobile && this.getActionToExpandCollapsePanel(), this.enableNewReports && canCreateReports &&
             h("calcite-button", { appearance: "solid", onClick: this.navigateToCreateFeature.bind(this), slot: "footer", width: "full" }, this.reportButtonText ? this.reportButtonText : this._translations.createReportButtonText), h("calcite-panel", { "full-height": true }, h("feature-list", { applyLayerViewFilter: this.showMyReportsOnly, class: "height-full", highlightOnHover: true, locale: this.locale, mapView: this.mapView, noFeaturesFoundMsg: this._translations.featureErrorMsg, onFeatureSelect: this.onFeatureSelectFromList.bind(this), pageSize: 30, ref: el => this._featureList = el, reportingOptions: this.reportingOptions, selectedLayerId: layerId, showFeatureSymbol: this.showFeatureSymbol, sortingInfo: this._updatedSorting }))));
     }
@@ -903,8 +879,7 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
      * @protected
      */
     getFilterPanel() {
-        const currentLayersExpressions = this.layerExpressions ? this.layerExpressions.filter((exp) => exp.id === this._selectedLayerId) : [];
-        return (h("calcite-flow-item", { collapsed: this.isMobile && this._sidePanelCollapsed, heading: this._translations?.filterLayerTitle?.replace("{{title}}", this._selectedLayerName), loading: this._showLoadingIndicator, onCalciteFlowItemBack: this.backFromFilterPanel.bind(this) }, this.isMobile && this.getActionToExpandCollapsePanel(), h("div", { class: "width-full", slot: "footer" }, h("div", { class: "width-full", slot: "footer" }, h("calcite-button", { appearance: "solid", class: "footer-top-button footer-button", disabled: !this._filterActive, onClick: () => { void this._filterList?.forceReset(); }, width: "full" }, this._translations.resetFilter), h("calcite-button", { appearance: "outline", class: "footer-button", onClick: this.backFromFilterPanel.bind(this), width: "full" }, this._translations.close))), h("calcite-panel", { "full-height": true }, h("instant-apps-filter-list", { autoUpdateUrl: false, closeBtnOnClick: () => undefined, comboboxOverlayPositioning: "fixed", layerExpressions: currentLayersExpressions, onFilterListReset: () => this._handleFilterListReset(), onFilterUpdate: () => this._handleFilterUpdate(), ref: (el) => this._filterList = el, resetBtn: false, resetFiltersOnDisconnect: false, view: this.mapView, zoomBtn: false }))));
+        return (h("calcite-flow-item", { collapsed: this.isMobile && this._sidePanelCollapsed, heading: this._translations?.filterLayerTitle?.replace("{{title}}", this._selectedLayerName), loading: this._showLoadingIndicator, onCalciteFlowItemBack: this.backFromFilterPanel.bind(this) }, this.isMobile && this.getActionToExpandCollapsePanel(), h("div", { class: "width-full", slot: "footer" }, h("div", { class: "width-full", slot: "footer" }, h("calcite-button", { appearance: "solid", class: "footer-top-button footer-button", disabled: !this._filterActive, onClick: this.resetFilterList.bind(this), width: "full" }, this._translations.resetFilter), h("calcite-button", { appearance: "outline", class: "footer-button", onClick: this.backFromFilterPanel.bind(this), width: "full" }, this._translations.close))), h("calcite-panel", { "full-height": true }, h("instant-apps-filter-list", { autoUpdateUrl: false, closeBtnOnClick: () => undefined, comboboxOverlayPositioning: "fixed", layerExpressions: this._currentLayerExpressions, onFilterListReset: () => this._handleFilterListReset(), onFilterUpdate: () => this._handleFilterUpdate(this._filterList.filterCount > 0), ref: (el) => this._filterList = el, resetBtn: false, resetFiltersOnDisconnect: false, view: this.mapView, zoomBtn: false }))));
     }
     /**
      * Returns the calcite-flow item for feature details
@@ -964,6 +939,7 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
         else {
             if (this._editableLayerIds.length > 1) {
                 void this.setSelectedLayer('', '');
+                void this.handlePrevLayersFilter();
             }
             this._currentFeatureId = '';
         }
@@ -1220,7 +1196,8 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
             detail: this._editableLayerIds
         };
         await this.layerListLoaded(evt);
-        void this.setSelectedLayer(this._validLayers[0].id, this._validLayers[0].title);
+        await this.setSelectedLayer(this._validLayers[0].id, this._validLayers[0].title);
+        void this.handleSelectedLayersFilter();
     }
     /**
      * Updates the share url for current selected feature
@@ -1280,6 +1257,91 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
             }
         }
     }
+    /**
+     * Handles updating the current layer expressions and definition expression for the selected layer
+     * @protected
+     */
+    async handleSelectedLayersFilter() {
+        if (this._selectedLayer) {
+            this._currentLayerExpressions = this.layerExpressions ? this.layerExpressions.filter(exp => exp.id === this._selectedLayerId) : [];
+            this.setActiveDefinitionExpressions();
+        }
+    }
+    /**
+   * Handles updating the previous layer's definition expression to it's initial definition expression
+   * @protected
+   */
+    async handlePrevLayersFilter() {
+        if (this._prevSelectedLayerId) {
+            const prevLayer = await getLayerOrTable(this.mapView, this._prevSelectedLayerId);
+            if (prevLayer) {
+                prevLayer.definitionExpression = this._initDefExpressions[this._prevSelectedLayerId];
+            }
+        }
+    }
+    /**
+     * Resets the selected layer's definition expression with the initial definition expression
+     * @protected
+     */
+    resetFilterList() {
+        void this._filterList?.forceReset();
+        if (this._selectedLayer != null) {
+            this._selectedLayer.definitionExpression = this._initDefExpressions[this._selectedLayerId];
+            this._filterActive = false;
+        }
+    }
+    /**
+     * Sets the active definition expressions for the selected layer
+     * @protected
+     */
+    setActiveDefinitionExpressions() {
+        if (this._selectedLayer == null) {
+            return;
+        }
+        const defExpressions = [];
+        if (this._currentLayerExpressions?.length > 0) {
+            const layerExpression = this._currentLayerExpressions[0];
+            for (const expression of layerExpression.expressions) {
+                const { active, definitionExpression } = expression;
+                if (active && definitionExpression) {
+                    defExpressions.push(`(${definitionExpression})`);
+                }
+            }
+            this._filterActive = defExpressions.length > 0;
+            this.updateFilterLayerDefExpression(defExpressions, layerExpression.operator);
+        }
+    }
+    /**
+     * Updates the selected layer's definition expression based on the active expressions
+     * @protected
+     */
+    updateFilterLayerDefExpression(defExpressions, operator) {
+        const initDefExpression = this._initDefExpressions[this._selectedLayerId];
+        const combinedExpressions = defExpressions?.length > 0 && initDefExpression != null
+            ? `(${defExpressions.join(operator)}) AND (${initDefExpression})`
+            : defExpressions.length > 0
+                ? defExpressions.join(operator)
+                : initDefExpression;
+        this._selectedLayer.definitionExpression = combinedExpressions;
+    }
+    /**
+     * Sets the initial definition expressions for all the feature layers
+     * @protected
+     */
+    setInitExpressions() {
+        this._initDefExpressions = {};
+        if (this.mapView == null) {
+            return;
+        }
+        const map = this.mapView.map;
+        map.allLayers.concat(map.allTables).forEach(layer => {
+            if (layer.type !== "feature") {
+                return;
+            }
+            const fl = layer;
+            this._initDefExpressions[fl.id] = fl.definitionExpression;
+        });
+    }
     static get watchers() { return {
         "isMobile": ["isMobileWatchHandler"],
         "locale": ["localeWatchHandler"],

package/dist/components/instant-apps-filter-list2.js

@@ -108,7 +108,6 @@ const InstantAppsFilterList = /*@__PURE__*/ proxyCustomElement(class InstantApps
         this.filterLayerExpressions = undefined;
         this.messages = undefined;
         this.baseClass = baseClassLight;
-        this.disabled = true;
         this.initDefExpressions = undefined;
         this.initMapImageExpressions = undefined;
         this.initPointCloudFilters = undefined;
@@ -129,31 +128,27 @@ const InstantAppsFilterList = /*@__PURE__*/ proxyCustomElement(class InstantApps
         });
     }
     forceReset() {
-        this.handleResetFilter();
-        return this.initExpressions();
+        this.resetExpressions();
+        return Promise.resolve();
     }
-    restoreFilters(filterParamString, filterInitState) {
-        this.filterLayerExpressions = structuredClone(this.layerExpressions);
+    updateInitDefExpressions(filterInitState) {
         this.initDefExpressions = filterInitState.initDefExpressions;
         this.initMapImageExpressions = filterInitState.initMapImageExpressions;
         this.initPointCloudFilters = filterInitState.initPointCloudFilters;
-        const filters = filterParamString === null || filterParamString === void 0 ? void 0 : filterParamString.split(';').map(filter => JSON.parse(filter));
-        if (filters) {
-            this.filterCount = this.applyFilters(filters);
-        }
-        return this.initExpressions();
+        return Promise.resolve();
+    }
+    getCurrentLayerExpressions() {
+        const currentLayerExpressions = structuredClone(this.filterLayerExpressions);
+        return Promise.resolve(currentLayerExpressions);
     }
     connectedCallback() {
-        var _a;
         if (this.layerExpressions == null && this.view == null)
             return;
         this.isLayerExpUpdated = true;
         this.filterLayerExpressions = structuredClone(this.layerExpressions);
-        this.disabled = ((_a = this.filterLayerExpressions) === null || _a === void 0 ? void 0 : _a.length) ? undefined : true;
         this.handleLayerExpressionsUpdate();
     }
     async componentWillLoad() {
-        var _a;
         this.baseClass = getMode(this.el) === 'dark' ? baseClassDark : baseClassLight;
         await this.initializeModules();
         getMessages(this);
@@ -161,14 +156,15 @@ const InstantAppsFilterList = /*@__PURE__*/ proxyCustomElement(class InstantApps
             return;
         this.isLayerExpUpdated = true;
         this.filterLayerExpressions = this.layerExpressions != null ? structuredClone(this.layerExpressions) : [];
-        this.disabled = ((_a = this.filterLayerExpressions) === null || _a === void 0 ? void 0 : _a.length) ? undefined : true;
         if (this.view == null)
             return;
         this.handleLayerExpressionsUpdate();
     }
-    componentWillRender() {
+    componentDidRender() {
         var _a;
-        this.disabled = ((_a = this.filterLayerExpressions) === null || _a === void 0 ? void 0 : _a.length) > 0 ? undefined : true;
+        if (this.resetBtnEl != null) {
+            this.resetBtnEl.disabled = ((_a = this.filterLayerExpressions) === null || _a === void 0 ? void 0 : _a.length) > 0 ? false : true;
+        }
     }
     disconnectedCallback() {
         if (this.resetFiltersOnDisconnect) {
@@ -186,7 +182,7 @@ const InstantAppsFilterList = /*@__PURE__*/ proxyCustomElement(class InstantApps
     render() {
         const filterConfig = this.loading ? this.renderLoading() : this.initFilterConfig();
         const footer = this.renderFooter();
-        return (h(Host, { key: '055d2a02c5118e59462af8759c6bf2f39304fd75' }, h("calcite-panel", { key: '0335c9b28101257551902737ef373543aebee1f6', class: this.baseClass, ref: el => (this.panelEl = el) }, h("slot", { key: '4b471e66583b3f2fd733688d65ce8d3b2acbeb66', slot: "header-content", name: "filter-header-content" }), h("slot", { key: 'f5832075687a6812b902643fd057587b438b38cf', slot: "header-actions-end", name: "filter-header-actions-end" }), h("div", { key: "filter-container", class: CSS.filterContainer }, filterConfig, footer))));
+        return (h(Host, { key: '92daa28c3cada3360d3b3d4202f54842e2e42923' }, h("calcite-panel", { key: '43ed17c41f1c42dcb25a19423e1638885a4ca64b', class: this.baseClass, ref: el => (this.panelEl = el) }, h("slot", { key: 'df4bc6bdf21127e781f930cf476af2a5d8199c87', slot: "header-content", name: "filter-header-content" }), h("slot", { key: 'c2e6744535fb85e40ddd4de215f693258bf31e87', slot: "header-actions-end", name: "filter-header-actions-end" }), h("div", { key: "filter-container", class: CSS.filterContainer }, filterConfig, footer))));
     }
     renderLoading() {
         return h("calcite-loader", { label: "Loading filters..." });
@@ -259,7 +255,7 @@ const InstantAppsFilterList = /*@__PURE__*/ proxyCustomElement(class InstantApps
         var _a, _b, _c;
         const closeText = this.closeBtnText != null ? this.closeBtnText : (_a = this.messages) === null || _a === void 0 ? void 0 : _a.close;
         const btnWidth = this.closeBtn && this.resetBtn ? 'half' : 'full';
-        return (h("div", { class: CSS.footer, slot: "footer" }, this.resetBtn ? (h("calcite-button", { appearance: "outline", width: btnWidth, disabled: this.disabled, onClick: this.handleResetFilter.bind(this) }, (_b = this.messages) === null || _b === void 0 ? void 0 : _b.resetFilter)) : undefined, this.closeBtn ? (h("calcite-button", { appearance: "solid", width: btnWidth, kind: "brand", onClick: (_c = this.closeBtnOnClick) === null || _c === void 0 ? void 0 : _c.bind(this) }, closeText)) : undefined));
+        return (h("div", { class: CSS.footer, slot: "footer" }, this.resetBtn ? (h("calcite-button", { appearance: "outline", width: btnWidth, ref: (el) => (this.resetBtnEl = el), onClick: this.handleResetFilter.bind(this) }, (_b = this.messages) === null || _b === void 0 ? void 0 : _b.resetFilter)) : undefined, this.closeBtn ? (h("calcite-button", { appearance: "solid", width: btnWidth, kind: "brand", onClick: (_c = this.closeBtnOnClick) === null || _c === void 0 ? void 0 : _c.bind(this) }, closeText)) : undefined));
     }
     renderZoomTo(layerExpression) {
         var _a;
@@ -290,23 +286,29 @@ const InstantAppsFilterList = /*@__PURE__*/ proxyCustomElement(class InstantApps
     }
     async initExpressions() {
         this.loading = true;
-        if (this.filterLayerExpressions == null || this.view == null)
+        if (this.filterLayerExpressions == null || this.view == null) {
+            this.loading = false;
             return;
+        }
         await this.processExpressions();
         this.loading = false;
     }
     async processExpressions() {
-        var _a;
         if (!this.filterLayerExpressions)
             return;
         for (const layerExpression of this.filterLayerExpressions) {
             for (const expression of layerExpression.expressions || []) {
-                expression.active = (_a = expression.active) !== null && _a !== void 0 ? _a : expression.definitionExpression != null;
                 await this.setInitExpression(layerExpression, expression);
             }
         }
     }
     handleResetFilter() {
+        this.resetExpressions();
+        this.resetAllFilters();
+        this.generateURLParams();
+        this.filterListReset.emit();
+    }
+    resetExpressions() {
         var _a;
         (_a = this.filterLayerExpressions) === null || _a === void 0 ? void 0 : _a.forEach(layerExpression => {
             var _a;
@@ -334,9 +336,6 @@ const InstantAppsFilterList = /*@__PURE__*/ proxyCustomElement(class InstantApps
                 expression.active = false;
             });
         });
-        this.resetAllFilters();
-        this.generateURLParams();
-        this.filterListReset.emit();
     }
     resetExpressionUI(type, expression) {
         const { id } = expression;
@@ -1109,13 +1108,13 @@ const InstantAppsFilterList = /*@__PURE__*/ proxyCustomElement(class InstantApps
         "filterLayerExpressions": [32],
         "messages": [32],
         "baseClass": [32],
-        "disabled": [32],
         "initDefExpressions": [32],
         "initMapImageExpressions": [32],
         "initPointCloudFilters": [32],
         "getFilterInitState": [64],
         "forceReset": [64],
-        "restoreFilters": [64]
+        "updateInitDefExpressions": [64],
+        "getCurrentLayerExpressions": [64]
     }, undefined, {
         "view": ["watchViewHandler"],
         "layerExpressions": ["watchLayerExpressions"]

package/dist/components/instant-apps-interactive-legend-relationship2.js

@@ -89,15 +89,29 @@ const InstantAppsInteractiveLegendRelationship = /*@__PURE__*/ proxyCustomElemen
         if (!cellGroup)
             return;
         cellGroup.map((cell, cellIndex) => {
-            var _a, _b;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const uvInfos = ((_b = (_a = this.activeLayerInfo) === null || _a === void 0 ? void 0 : _a.layer) === null || _b === void 0 ? void 0 : _b.renderer).uniqueValueInfos;
             if (uvInfos[cellIndex]) {
-                const color = uvInfos[cellIndex].symbol.color;
+                const CIMSymbolColor_Index = (_g = (_f = (_e = (_d = (_c = uvInfos === null || uvInfos === void 0 ? void 0 : uvInfos[cellIndex]) === null || _c === void 0 ? void 0 : _c.symbol) === null || _d === void 0 ? void 0 : _d['data']) === null || _e === void 0 ? void 0 : _e.symbol) === null || _f === void 0 ? void 0 : _f.symbolLayers) === null || _g === void 0 ? void 0 : _g[1].color;
+                const colorFromUVInfo_Index = (_j = (_h = uvInfos === null || uvInfos === void 0 ? void 0 : uvInfos[cellIndex]) === null || _h === void 0 ? void 0 : _h.symbol) === null || _j === void 0 ? void 0 : _j.color;
                 uvInfos.forEach((uvInfo, index) => {
-                    const itemColor = uvInfo.symbol.color;
-                    const match = color.r === itemColor.r && color.g === itemColor.g && color.b === itemColor.b && color.a === itemColor.a;
-                    if (match)
+                    var _a, _b, _c, _d, _e;
+                    const colorFromUVInfo = (_a = uvInfo === null || uvInfo === void 0 ? void 0 : uvInfo.symbol) === null || _a === void 0 ? void 0 : _a.color;
+                    const CIMSymbolColor = (_e = (_d = (_c = (_b = uvInfo === null || uvInfo === void 0 ? void 0 : uvInfo.symbol) === null || _b === void 0 ? void 0 : _b['data']) === null || _c === void 0 ? void 0 : _c.symbol) === null || _d === void 0 ? void 0 : _d.symbolLayers) === null || _e === void 0 ? void 0 : _e[1].color;
+                    let match = false;
+                    if (CIMSymbolColor) {
+                        match = CIMSymbolColor.every((value, i) => value === CIMSymbolColor_Index[i]);
+                    }
+                    else {
+                        match =
+                            colorFromUVInfo.r === colorFromUVInfo_Index.r &&
+                                colorFromUVInfo.g === colorFromUVInfo_Index.g &&
+                                colorFromUVInfo.b === colorFromUVInfo_Index.b &&
+                                colorFromUVInfo.a === colorFromUVInfo_Index.a;
+                    }
+                    if (match) {
                         this.setCellAttributes(cell, index);
+                    }
                 });
                 cell.classList.add('esri-interactive-legend__svg-rect-element');
             }

package/dist/components/instant-apps-language-switcher.js

@@ -54,7 +54,7 @@ const InstantAppsLanguageSwitcher$1 = /*@__PURE__*/ proxyCustomElement(class Ins
         this.messages = await getMessages(document.createElement('instant-apps-language-translator'));
         try {
             this.portalItemResource = (await getPortalItemResource(this.portalItem));
-            const t9nData = await fetchResourceData(request, this.portalItemResource);
+            const t9nData = await fetchResourceData(this.portalItemResource);
             this.t9nData = t9nData !== null && t9nData !== void 0 ? t9nData : {};
         }
         catch (err) {
@@ -95,7 +95,7 @@ const InstantAppsLanguageSwitcher$1 = /*@__PURE__*/ proxyCustomElement(class Ins
         const trigger = this.renderTrigger();
         const dropdown = this.renderDropdownItems();
         const defaultLocale = this.renderDefaultLocale();
-        return (h("calcite-dropdown", { key: 'ce2effa615127d96ffa5995e09e6b92256d1e549', onCalciteDropdownBeforeOpen: () => (this.trigger.iconEnd = 'chevron-up'), onCalciteDropdownBeforeClose: () => (this.trigger.iconEnd = 'chevron-down'), "overlay-positioning": this.calciteDropdownOverlayPositioning, "width-scale": "m" }, trigger, defaultLocale, dropdown));
+        return (h("calcite-dropdown", { key: '7f9b97b70ec4a84ebd17d0d41ba598ae15304f10', onCalciteDropdownBeforeOpen: () => (this.trigger.iconEnd = 'chevron-up'), onCalciteDropdownBeforeClose: () => (this.trigger.iconEnd = 'chevron-down'), "overlay-positioning": this.calciteDropdownOverlayPositioning, "width-scale": "m" }, trigger, defaultLocale, dropdown));
     }
     renderDefaultLocale() {
         const { userLocale } = this;
@@ -177,7 +177,7 @@ const InstantAppsLanguageSwitcher$1 = /*@__PURE__*/ proxyCustomElement(class Ins
     async refresh() {
         try {
             const resource = (await getPortalItemResource(this.portalItem));
-            const t9nData = await fetchResourceData(this.request, resource);
+            const t9nData = await fetchResourceData(resource);
             this.t9nData = t9nData;
             const refreshedData = { locale: this.selectedLanguage, data: t9nData[this.selectedLanguage] };
             this.selectedLanguageUpdated.emit(refreshedData);

package/dist/components/instant-apps-language-translator2.js

@@ -24,17 +24,9 @@ import { d as defineCustomElement$3 } from './instant-apps-ckeditor-wrapper2.js'
 import { d as defineCustomElement$2 } from './instant-apps-language-translator-item2.js';
 import { d as defineCustomElement$1 } from './instant-apps-language-translator-search2.js';
 
-async function fetchResourceData(request, resource) {
-    var _a, _b, _c;
+async function fetchResourceData(resource) {
     try {
-        const token = (_c = (_b = (_a = resource === null || resource === void 0 ? void 0 : resource.portalItem) === null || _a === void 0 ? void 0 : _a.portal) === null || _b === void 0 ? void 0 : _b['credential']) === null || _c === void 0 ? void 0 : _c['token'];
-        const reqConfig = { responseType: 'json' };
-        if (token)
-            reqConfig.query = { token };
-        var cacheBuster = 'cacheBuster=' + Date.now();
-        const url = `${resource.url}?${cacheBuster}`;
-        const reqRes = await request(url, reqConfig);
-        const t9nData = reqRes.data;
+        const t9nData = await resource.fetch('json', { cacheBust: true });
         return Promise.resolve(t9nData);
     }
     catch (err) {
@@ -977,14 +969,14 @@ const InstantAppsLanguageTranslator = /*@__PURE__*/ proxyCustomElement(class Ins
         try {
             const portalItemResource = (await getPortalItemResource(this.portalItem));
             store.set('portalItemResource', portalItemResource);
-            const t9nData = await fetchResourceData(this.request, portalItemResource);
+            const t9nData = await fetchResourceData(portalItemResource);
             store.set('lastSave', t9nData.lastSave);
             store.set('portalItemResourceT9n', t9nData !== null && t9nData !== void 0 ? t9nData : {});
         }
         catch (_a) { }
     }
     render() {
-        return (h(Host, { key: '1f68786d3e9bced7a2242033cf51fc4937bc910a' }, this.renderModal(), this.renderPopoverTip()));
+        return (h(Host, { key: 'bbd0cf37c4aa5e145ee14cc17f8a005bcc28ac9c' }, this.renderModal(), this.renderPopoverTip()));
     }
     renderModal() {
         return (h("calcite-modal", { open: this.open, scale: "l", fullscreen: true, onCalciteModalClose: this.close.bind(this) }, this.renderHeader(), this.renderContent(), this.renderPrimaryContent()));

package/dist/components/instant-apps-splash.js

@@ -53,11 +53,12 @@ function removeItemFromLocalStorage(key) {
     (_a = window === null || window === void 0 ? void 0 : window.localStorage) === null || _a === void 0 ? void 0 : _a.removeItem(key);
 }
 
-const instantAppsSplashCss = ":host{display:block}:host .image.image_resized img{width:100%}:host .instant-apps-splash__back-content{display:flex;align-items:center}:host .instant-apps-splash__back-content calcite-label{--calcite-label-margin-bottom:0}";
+const instantAppsSplashCss = ":host{--instant-apps-splash-content-max-height:100%;display:block}:host .image.image_resized img{width:100%}:host .instant-apps-splash__back-content{display:flex;align-items:center}:host .instant-apps-splash__back-content calcite-label{--calcite-label-margin-bottom:0}:host .instant-apps-splash__content{max-height:var(--instant-apps-splash-content-max-height)}";
 const InstantAppsSplashStyle0 = instantAppsSplashCss;
 
 const CSS = {
     back: 'instant-apps-splash__back-content',
+    content: 'instant-apps-splash__content',
 };
 const InstantAppsSplash$1 = /*@__PURE__*/ proxyCustomElement(class InstantAppsSplash extends HTMLElement {
     constructor() {
@@ -99,7 +100,7 @@ const InstantAppsSplash$1 = /*@__PURE__*/ proxyCustomElement(class InstantAppsSp
         getMessages(this);
     }
     render() {
-        return (h("calcite-modal", { key: '1ab8d4142fe5c3ac087c2146af6f8510183af8a8', onCalciteModalClose: this.close.bind(this), open: this.open, closeButtonDisabled: this.closeButtonDisabled, outsideCloseDisabled: this.outsideCloseDisabled }, this.renderHeader(), this.renderContent(), this.localStorageKey ? this.renderDontShowThisAgainCheckbox() : null, this.renderPrimaryButton(), this.secondaryButton ? this.renderSecondaryButton() : null));
+        return (h("calcite-modal", { key: '9496c3fd2cee50e19313f82ca1acd5532e8ba4d1', onCalciteModalClose: this.close.bind(this), open: this.open, closeButtonDisabled: this.closeButtonDisabled, outsideCloseDisabled: this.outsideCloseDisabled }, this.renderHeader(), this.renderContent(), this.localStorageKey ? this.renderDontShowThisAgainCheckbox() : null, this.renderPrimaryButton(), this.secondaryButton ? this.renderSecondaryButton() : null));
     }
     renderHeader() {
         const { titleText } = this;
@@ -107,7 +108,7 @@ const InstantAppsSplash$1 = /*@__PURE__*/ proxyCustomElement(class InstantAppsSp
     }
     renderContent() {
         const { content } = this;
-        return (h("div", { slot: "content", innerHTML: content }, h("slot", { name: "custom-action" })));
+        return (h("div", { slot: "content", class: CSS.content, innerHTML: content }, h("slot", { name: "custom-action" })));
     }
     renderDontShowThisAgainCheckbox() {
         const { localStorageKey, messages } = this;

package/dist/components/layer-table2.js

@@ -423,8 +423,8 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
     /**
      * Updates the filter
      */
-    async filterUpdate() {
-        await this._handleFilterUpdate();
+    async filterUpdate(active) {
+        await this._handleFilterUpdate(active);
     }
     /**
      * Closes the filter
@@ -566,10 +566,10 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
         const tableHeightClass = this.isMobile ? "height-full" : "height-full-adjusted";
         const showSearch = this._canShowFullTextSearch();
         this._validateActiveActions();
-        return (h(Host, { key: '5cbb5ba55c63eaf278666aac034a01d971d9f12a' }, h("calcite-shell", { key: '8a27d87fc002b72fe478d25885b2ab04261362ca' }, this._getTableControlRow("header"), h("div", { key: '250c356a30389b8cb95628953f3bb3ec5c88361d', class: `width-full ${tableHeightClass}` }, h("calcite-panel", { key: '9d5dbb084031bdface1dbc3a1dbc2fa33eb163b5', class: "height-full width-full" }, showSearch &&
-            h("div", { key: '2d45ae4255a1d0e3cf14aa0f6a01915a38626bc7', class: "search-container" }, h("calcite-input", { key: 'c73546fef30db70d01cf8978a5daf9ea4193ddc2', class: "search", clearable: true, icon: "search", onCalciteInputChange: (evt) => void this._searchTextChanged(evt), placeholder: this._searchPlaceHolder, title: this._searchPlaceHolder, type: "search" })), h("calcite-loader", { key: '61621afb1e5fa67e25b878320c8497200b8265cd', class: loadingClass, label: this._translations.fetchingData, scale: "l" }), h("div", { key: '0ef4fe0e4099ec60f4c38e2c421920c9a8fe3c4f', class: tableNodeClass, ref: this.onTableNodeCreate }))), !this.isMobile ? (h("div", { class: "bottom-left text-color height-19" }, this._translations.recordsSelected
+        return (h(Host, { key: 'f56462fd5d5afa71052cf2557069bb2fee15aaeb' }, h("calcite-shell", { key: '92ccfa2235269aad6da5f918f79ec8ae100e99ca' }, this._getTableControlRow("header"), h("div", { key: 'e5b8fe5e4236e1a7b7e9d31ad784d9bb52a6918d', class: `width-full ${tableHeightClass}` }, h("calcite-panel", { key: 'eca933d832e5b6efddb025211c253bf09e41ab22', class: "height-full width-full" }, showSearch &&
+            h("div", { key: 'e819896c4264db3ee95d10194b67da65997b541d', class: "search-container" }, h("calcite-input", { key: 'e979c7962205caf072057332280b9e04ecd233c4', class: "search", clearable: true, icon: "search", onCalciteInputChange: (evt) => void this._searchTextChanged(evt), placeholder: this._searchPlaceHolder, title: this._searchPlaceHolder, type: "search" })), h("calcite-loader", { key: 'ee715472a4f819dd1e9328e75022439e9bba1334', class: loadingClass, label: this._translations.fetchingData, scale: "l" }), h("div", { key: '8085821dea31de1fcbb1119e5791c0dea744e470', class: tableNodeClass, ref: this.onTableNodeCreate }))), !this.isMobile ? (h("div", { class: "bottom-left text-color height-19" }, this._translations.recordsSelected
             .replace("{{total}}", total)
-            .replace("{{selected}}", selected))) : undefined), this.createFilterModal && this._filterModal(), h("delete-dialog", { key: 'e2564b1d08476f762577247ffb41a00e5c41514c', id: "deleteDialogId", ids: this._getIds(), layer: this._layer, locale: this.locale, onDeleteDialogClose: () => this._deleteDialogOpen = false, open: this._deleteDialogOpen, ref: (el) => this._deleteDialog = el })));
+            .replace("{{selected}}", selected))) : undefined), this.createFilterModal && this._filterModal(), h("delete-dialog", { key: '20c9a06c3f0d44433d9442755d25658c249e102c', id: "deleteDialogId", ids: this._getIds(), layer: this._layer, locale: this.locale, onDeleteDialogClose: () => this._deleteDialogOpen = false, open: this._deleteDialogOpen, ref: (el) => this._deleteDialog = el })));
     }
     _deleteDialog;
     /**
@@ -1614,7 +1614,7 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
      * @protected
      */
     _filterModal() {
-        return (h("calcite-modal", { "aria-labelledby": "modal-title", class: "modal", kind: "brand", onCalciteModalClose: () => void this._closeFilter(), open: this._filterOpen, widthScale: "s" }, h("div", { class: "display-flex align-center", id: "modal-title", slot: "header" }, this._translations?.filter?.replace("{{title}}", this._layer?.title)), h("div", { slot: "content" }, h("instant-apps-filter-list", { autoUpdateUrl: false, closeBtn: true, closeBtnOnClick: async () => this._closeFilter(), comboboxOverlayPositioning: "fixed", layerExpressions: this._layerExpressions, onFilterListReset: () => void this._handleFilterListReset(), onFilterUpdate: () => void 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: () => void this._closeFilter(), open: this._filterOpen, widthScale: "s" }, h("div", { class: "display-flex align-center", id: "modal-title", slot: "header" }, this._translations?.filter?.replace("{{title}}", this._layer?.title)), h("div", { slot: "content" }, h("instant-apps-filter-list", { autoUpdateUrl: false, closeBtn: true, closeBtnOnClick: async () => this._closeFilter(), comboboxOverlayPositioning: "fixed", layerExpressions: this._layerExpressions, onFilterListReset: () => void this._handleFilterListReset(), onFilterUpdate: () => void this._handleFilterUpdate(this._filterList.filterCount > 0), ref: (el) => this._filterList = el, view: this.mapView, zoomBtn: false }))));
     }
     /**
      * Reset the filter active prop
@@ -1629,7 +1629,7 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
      * Check if the layers definitionExpression has been modified
      * @protected
      */
-    async _handleFilterUpdate() {
+    async _handleFilterUpdate(active) {
         const defExp = this._layer.definitionExpression;
         if (this._floorExpression) {
             const regEx = new RegExp(`${this._floorField} = ['].+[']`, "gm");
@@ -1637,8 +1637,7 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
                 defExp.replace(regEx, this._floorExpression) : defExp ?
                 `${defExp} AND (${this._floorExpression})` : this._floorExpression;
         }
-        this._filterActive = this._definitionExpression !== this._layer.definitionExpression &&
-            (this._floorExpression ? this._layer.definitionExpression !== this._floorExpression : true);
+        this._filterActive = active;
         this._updateShareUrl();
         await this._searchFullText();
     }