@esri/solutions-components 0.10.42 → 0.10.43

package/dist/cjs/{utils-fa7ad44b.js → utils-3f10ea6b.js}

@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const locale = require('./locale-4a18a858.js');
+const locale = require('./locale-4b820602.js');
 const index = require('./index-2b13a4d5.js');
 
 exports.EInputType = void 0;
@@ -131,7 +131,7 @@ function initExternalCKEditorStyles() {
     document.head.appendChild(style);
 }
 async function updateLastSave(resource) {
-    const data = await resource.fetch();
+    const data = store.get('portalItemResourceT9n');
     const lastSave = Date.now();
     store.set('lastSave', lastSave);
     const dataStr = JSON.stringify(Object.assign(Object.assign({}, data), { lastSave }));

package/dist/collection/components/crowdsource-reporter/crowdsource-reporter.js

@@ -213,17 +213,17 @@ export class CrowdsourceReporter {
      */
     _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
@@ -248,6 +248,7 @@ export class CrowdsourceReporter {
      */
     async mapViewWatchHandler() {
         await this.mapView.when(async () => {
+            this.setInitExpressions();
             await this.setMapView();
         });
     }
@@ -326,15 +327,25 @@ export class CrowdsourceReporter {
             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()))));
     }
     //--------------------------------------------------------------------------
     //
@@ -398,7 +409,6 @@ export class CrowdsourceReporter {
                     break;
                 case "filter-panel":
                     renderLists.push(this.getFilterPanel());
-                    void this._restoreFilters();
                     break;
                 case "feature-details":
                     renderLists.push(this.getFeatureDetailsFlowItem());
@@ -445,20 +455,6 @@ export class CrowdsourceReporter {
         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
@@ -466,8 +462,6 @@ export class CrowdsourceReporter {
     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
@@ -475,9 +469,7 @@ export class CrowdsourceReporter {
      */
     async _handleFilterUpdate(active) {
         this._showLoadingIndicator = true;
-        //if filters are applied the url params will be generated
         this._filterActive = active;
-        this._filterUrlParams = this._filterList.urlParams.getAll('filter');
         await this._featureList.refresh();
         this._showLoadingIndicator = false;
     }
@@ -644,10 +636,6 @@ export class CrowdsourceReporter {
         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();
@@ -719,28 +707,18 @@ export class CrowdsourceReporter {
         };
         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();
     }
@@ -855,9 +833,8 @@ export class CrowdsourceReporter {
      * @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 }))));
     }
@@ -867,8 +844,7 @@ export class CrowdsourceReporter {
      * @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(this._filterList.filterCount > 0), 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
@@ -928,6 +904,7 @@ export class CrowdsourceReporter {
         else {
             if (this._editableLayerIds.length > 1) {
                 void this.setSelectedLayer('', '');
+                void this.handlePrevLayersFilter();
             }
             this._currentFeatureId = '';
         }
@@ -1184,7 +1161,8 @@ export class CrowdsourceReporter {
             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
@@ -1244,6 +1222,91 @@ export class CrowdsourceReporter {
             }
         }
     }
+    /**
+     * 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 is() { return "crowdsource-reporter"; }
     static get originalStyleUrls() {
         return {

package/dist/collection/components/solution-spatial-ref/solution-spatial-ref.js

@@ -75,7 +75,7 @@ export class SolutionSpatialRef {
     }
     render() {
         this._updateUIFromStore();
-        return (h(Host, { key: 'c4d6b7debb3852da999002bd1d9394ba4a4f2da8' }, h("label", { key: 'e16a28157db4c3aece6a00460816c3394f1f9198', class: "switch-label" }, h("calcite-switch", { key: '48d3b1c12aa93c50ccf424ccaf0a810855227b8d', checked: this.enabled, class: "spatial-ref-switch", onCalciteSwitchChange: (event) => this.enabled = event.target.checked, scale: "m" }), this._translations.enableSpatialReference), h("br", { key: '0e7eb35accdccef9f17e0a24b17180d25c4f054a' }), h("div", { key: '257e130fdda5e42a8c40662f21c3d315f91562c7', class: "spatial-ref-component", id: "spatialRefDefn" }, this._renderFeatureServicesList(this.featureServices)), h("label", { key: 'd7581971bb310c6c4b0fb1015db59a359da54b90', class: "switch-label spatial-ref-component" }, h("calcite-switch", { key: '3045b179955101fc5baff8ca09cb10d0077e35ca', checked: this.enableDefault, class: "spatial-ref-switch", disabled: !this.enabled, onCalciteSwitchChange: (event) => this.enableDefault = event.target.checked, scale: "m" }), this._translations.enableDefaultSpatialReference)));
+        return (h(Host, { key: 'b8775ad1a6a18c0b32d020c02d6f9fe13f5d578a' }, h("label", { key: 'd10fa03d4d127579eed4fec2c6c907dc46166bdf', class: "switch-label" }, h("calcite-switch", { key: 'ce47d98234008f377d674851ce77c68ebaa4fd71', checked: this.enabled, class: "spatial-ref-switch", onCalciteSwitchChange: (event) => this.enabled = event.target.checked, scale: "m" }), this._translations.enableSpatialReference), h("br", { key: '54dc5ccf3fec55650f62d8dbeb09071c8e88805c' }), h("div", { key: '03257e474d254e4d5a0dd10ac7ab6e8b88f85d54', class: "spatial-ref-component", id: "spatialRefDefn" }, this._renderFeatureServicesList(this.featureServices)), h("label", { key: 'fac415766affa3b1620ce6a5c3d5ef900b25944f', class: "switch-label spatial-ref-component" }, h("calcite-switch", { key: '611b69b0895267702a69a70436033274d3d28892', checked: this.enableDefault, class: "spatial-ref-switch", disabled: !this.enabled, onCalciteSwitchChange: (event) => this.enableDefault = event.target.checked, scale: "m" }), this._translations.enableDefaultSpatialReference)));
     }
     //--------------------------------------------------------------------------
     //
@@ -345,7 +345,7 @@ export class SolutionSpatialRef {
             },
             "locale": {
                 "type": "string",
-                "mutable": false,
+                "mutable": true,
                 "complexType": {
                     "original": "string",
                     "resolved": "string",

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,8 +497,6 @@ 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
@@ -510,9 +504,7 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
      */
     async _handleFilterUpdate(active) {
         this._showLoadingIndicator = true;
-        //if filters are applied the url params will be generated
         this._filterActive = active;
-        this._filterUrlParams = this._filterList.urlParams.getAll('filter');
         await this._featureList.refresh();
         this._showLoadingIndicator = false;
     }
@@ -679,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();
@@ -754,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();
     }
@@ -890,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 }))));
     }
@@ -902,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(this._filterList.filterCount > 0), 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
@@ -963,6 +939,7 @@ const CrowdsourceReporter$1 = /*@__PURE__*/ proxyCustomElement(class Crowdsource
         else {
             if (this._editableLayerIds.length > 1) {
                 void this.setSelectedLayer('', '');
+                void this.handlePrevLayersFilter();
             }
             this._currentFeatureId = '';
         }
@@ -1219,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
@@ -1279,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"],