@esri/solutions-components 0.10.42 → 0.10.44

package/dist/cjs/calcite-action-pad_2.cjs.entry.js

@@ -15,7 +15,7 @@ const locale = require('./locale-da840314.js');
 const t9n = require('./t9n-ed5c03a7.js');
 const ExpandToggle = require('./ExpandToggle-2cdd9a8e.js');
 const observers = require('./observers-18d87cb5.js');
-const loadModules = require('./loadModules-8567855e.js');
+const loadModules = require('./loadModules-df8b13ca.js');
 require('./guid-e84a8375.js');
 require('./resources-18f799c7.js');
 require('./browser-333a21c5.js');

package/dist/cjs/calcite-block_5.cjs.entry.js

@@ -27,8 +27,8 @@ const guid = require('./guid-e84a8375.js');
 const component = require('./component-5d190962.js');
 const Validation = require('./Validation-55fc2417.js');
 const input = require('./input-8c28213d.js');
-const loadModules = require('./loadModules-8567855e.js');
-const locale$1 = require('./locale-4a18a858.js');
+const loadModules = require('./loadModules-df8b13ca.js');
+const locale$1 = require('./locale-4b820602.js');
 const mode = require('./mode-3478ba36.js');
 require('./observers-18d87cb5.js');
 require('./resources-18f799c7.js');
@@ -1538,7 +1538,6 @@ const InstantAppsFilterList = class {
         this.filterLayerExpressions = undefined;
         this.messages = undefined;
         this.baseClass = baseClassLight;
-        this.disabled = true;
         this.initDefExpressions = undefined;
         this.initMapImageExpressions = undefined;
         this.initPointCloudFilters = undefined;
@@ -1559,31 +1558,27 @@ const InstantAppsFilterList = class {
         });
     }
     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 = mode.getMode(this.el) === 'dark' ? baseClassDark : baseClassLight;
         await this.initializeModules();
         locale$1.getMessages(this);
@@ -1591,14 +1586,15 @@ const InstantAppsFilterList = class {
             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) {
@@ -1616,7 +1612,7 @@ const InstantAppsFilterList = class {
     render() {
         const filterConfig = this.loading ? this.renderLoading() : this.initFilterConfig();
         const footer = this.renderFooter();
-        return (index.h(index.Host, { key: '055d2a02c5118e59462af8759c6bf2f39304fd75' }, index.h("calcite-panel", { key: '0335c9b28101257551902737ef373543aebee1f6', class: this.baseClass, ref: el => (this.panelEl = el) }, index.h("slot", { key: '4b471e66583b3f2fd733688d65ce8d3b2acbeb66', slot: "header-content", name: "filter-header-content" }), index.h("slot", { key: 'f5832075687a6812b902643fd057587b438b38cf', slot: "header-actions-end", name: "filter-header-actions-end" }), index.h("div", { key: "filter-container", class: CSS$1.filterContainer }, filterConfig, footer))));
+        return (index.h(index.Host, { key: '92daa28c3cada3360d3b3d4202f54842e2e42923' }, index.h("calcite-panel", { key: '43ed17c41f1c42dcb25a19423e1638885a4ca64b', class: this.baseClass, ref: el => (this.panelEl = el) }, index.h("slot", { key: 'df4bc6bdf21127e781f930cf476af2a5d8199c87', slot: "header-content", name: "filter-header-content" }), index.h("slot", { key: 'c2e6744535fb85e40ddd4de215f693258bf31e87', slot: "header-actions-end", name: "filter-header-actions-end" }), index.h("div", { key: "filter-container", class: CSS$1.filterContainer }, filterConfig, footer))));
     }
     renderLoading() {
         return index.h("calcite-loader", { label: "Loading filters..." });
@@ -1689,7 +1685,7 @@ const InstantAppsFilterList = class {
         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 (index.h("div", { class: CSS$1.footer, slot: "footer" }, this.resetBtn ? (index.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 ? (index.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 (index.h("div", { class: CSS$1.footer, slot: "footer" }, this.resetBtn ? (index.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 ? (index.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;
@@ -1720,23 +1716,29 @@ const InstantAppsFilterList = class {
     }
     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;
@@ -1764,9 +1766,6 @@ const InstantAppsFilterList = class {
                 expression.active = false;
             });
         });
-        this.resetAllFilters();
-        this.generateURLParams();
-        this.filterListReset.emit();
     }
     resetExpressionUI(type, expression) {
         const { id } = expression;

package/dist/cjs/card-manager_3.cjs.entry.js

@@ -426,6 +426,10 @@ const LayerTable = class {
      * string the current search expression
      */
     _searchExpression;
+    /**
+     * number[]: selected features from table
+     */
+    _tempSelectedIds;
     //--------------------------------------------------------------------------
     //
     //  Watch handlers
@@ -731,10 +735,10 @@ const LayerTable = class {
         const tableHeightClass = this.isMobile ? "height-full" : "height-full-adjusted";
         const showSearch = this._canShowFullTextSearch();
         this._validateActiveActions();
-        return (index.h(index.Host, { key: 'f56462fd5d5afa71052cf2557069bb2fee15aaeb' }, index.h("calcite-shell", { key: '92ccfa2235269aad6da5f918f79ec8ae100e99ca' }, this._getTableControlRow("header"), index.h("div", { key: 'e5b8fe5e4236e1a7b7e9d31ad784d9bb52a6918d', class: `width-full ${tableHeightClass}` }, index.h("calcite-panel", { key: 'eca933d832e5b6efddb025211c253bf09e41ab22', class: "height-full width-full" }, showSearch &&
-            index.h("div", { key: 'e819896c4264db3ee95d10194b67da65997b541d', class: "search-container" }, index.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" })), index.h("calcite-loader", { key: 'ee715472a4f819dd1e9328e75022439e9bba1334', class: loadingClass, label: this._translations.fetchingData, scale: "l" }), index.h("div", { key: '8085821dea31de1fcbb1119e5791c0dea744e470', class: tableNodeClass, ref: this.onTableNodeCreate }))), !this.isMobile ? (index.h("div", { class: "bottom-left text-color height-19" }, this._translations.recordsSelected
+        return (index.h(index.Host, { key: '0998f68ec5ab3fe8c2e7a21aa832137730faf94f' }, index.h("calcite-shell", { key: 'a6f00f0280358c318cbed1afc48d54ae0ffae465' }, this._getTableControlRow("header"), index.h("div", { key: '744786c1915fd86e81c278ecc75c862312c1ec6f', class: `width-full ${tableHeightClass}` }, index.h("calcite-panel", { key: 'b59b7bcf0f6e3f5411ff0ecf5de8e6bd747fbe4a', class: "height-full width-full" }, showSearch &&
+            index.h("div", { key: '6c62638d97156a2101764bf620b0f48b70f906ad', class: "search-container" }, index.h("calcite-input", { key: '8ff64d0529b5e3fe281490917ba44a829567cb0c', class: "search", clearable: true, icon: "search", onCalciteInputChange: (evt) => void this._searchTextChanged(evt), placeholder: this._searchPlaceHolder, title: this._searchPlaceHolder, type: "search" })), index.h("calcite-loader", { key: '7f673a2fd30a5828dec0400d01c581440a3adf6b', class: loadingClass, label: this._translations.fetchingData, scale: "l" }), index.h("div", { key: '39c0801b1992db5f8782d6b3569fa89ba47ce8ce', class: tableNodeClass, ref: this.onTableNodeCreate }))), !this.isMobile ? (index.h("div", { class: "bottom-left text-color height-19" }, this._translations.recordsSelected
             .replace("{{total}}", total)
-            .replace("{{selected}}", selected))) : undefined), this.createFilterModal && this._filterModal(), index.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 })));
+            .replace("{{selected}}", selected))) : undefined), this.createFilterModal && this._filterModal(), index.h("delete-dialog", { key: '6bf4038662260c566d304a63d8f118265a1bf69e', id: "deleteDialogId", ids: this._getIds(), layer: this._layer, locale: this.locale, onDeleteDialogClose: () => this._deleteDialogOpen = false, open: this._deleteDialogOpen, ref: (el) => this._deleteDialog = el })));
     }
     _deleteDialog;
     /**
@@ -794,18 +798,37 @@ const LayerTable = class {
      *
      */
     async _searchFullText() {
+        let selectedIds = [];
+        let showSelected = false;
+        if (this._showOnlySelected) {
+            selectedIds = this._tempSelectedIds;
+            showSelected = true;
+        }
+        else {
+            this._clearSelection();
+            this._tempSelectedIds = [];
+        }
         //always clear previous search definition
         if (this._searchExpression) {
             this._clearSearchDefinitionExpression();
         }
+        let searchedIds = [];
         if (this._fullTextSearchInfo.length) {
             if (this._fullTextSearchInfo[0].searchTerm) {
                 const searchQueryParams = this._layer.createQuery();
                 searchQueryParams.fullText = this._fullTextSearchInfo;
-                const searchedIds = await this._layer.queryObjectIds(searchQueryParams);
+                searchedIds = await this._layer.queryObjectIds(searchQueryParams);
+                if (showSelected && selectedIds?.length) {
+                    searchedIds = searchedIds.filter((id) => selectedIds.includes(id));
+                }
                 await this._updateSearchDefinitionExpression(searchedIds?.length ? searchedIds : [-1]);
             }
         }
+        // highlight the feature only when selected feature is present in applied filter
+        if (showSelected && searchedIds?.length) {
+            this._showOnlySelected = true;
+            this._table.highlightIds.addMany(searchedIds.reverse());
+        }
         //Added timeout and table.refresh() to avoid the issue in which we see empty table records after searching in combination to filter/reset filter
         await new Promise(resolve => setTimeout(resolve, 800));
         await this._updateAllIds();
@@ -1425,6 +1448,7 @@ const LayerTable = class {
                     highlightEnabled: true,
                     multiSortEnabled: false,
                     visibleElements: {
+                        columnDescriptions: false,
                         header: false,
                         menu: false
                     },
@@ -1455,6 +1479,7 @@ const LayerTable = class {
                     // only readd in specific case where we have multiple selected and then click one of the currently selected
                     const reAdd = this.selectedIds.length > 1 && evt.removed.length === 1;
                     const newIds = reAdd ? evt.removed : ids.filter(id => this.selectedIds.indexOf(id) < 0);
+                    this._tempSelectedIds = newIds.length ? [...newIds] : [...this.selectedIds];
                     this._clearSelection();
                     this.selectedIds = [...newIds];
                     if (newIds.length > 0) {
@@ -1467,10 +1492,12 @@ const LayerTable = class {
                 else {
                     // https://github.com/Esri/solutions-components/issues/365
                     this.selectedIds = ids.reverse();
+                    this._tempSelectedIds = [...this.selectedIds];
                 }
             }
             else if (this._ctrlIsPressed) {
                 this.selectedIds = ids.reverse();
+                this._tempSelectedIds = [...this.selectedIds];
             }
             else if (this._shiftIsPressed && ids?.length > 0) {
                 this._skipOnChange = true;
@@ -1507,6 +1534,7 @@ const LayerTable = class {
                     }, []);
                     const selectedIds = _start < _end ? idsInRange.reverse() : idsInRange;
                     this.selectedIds = [...new Set([...selectedIds, ...this.selectedIds])];
+                    this._tempSelectedIds = [...this.selectedIds];
                     this._table.highlightIds.addMany(this.selectedIds.filter(i => ids.indexOf(i) < 0));
                 }
             }

package/dist/cjs/{constants-51cf394f.js → constants-bed33322.js}

@@ -5,19 +5,11 @@
  */
 'use strict';
 
-const loadModules = require('./loadModules-8567855e.js');
+const loadModules = require('./loadModules-df8b13ca.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) {

package/dist/cjs/crowdsource-reporter.cjs.entry.js

@@ -204,17 +204,17 @@ const CrowdsourceReporter = class {
      */
     _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
@@ -239,6 +239,7 @@ const CrowdsourceReporter = class {
      */
     async mapViewWatchHandler() {
         await this.mapView.when(async () => {
+            this.setInitExpressions();
             await this.setMapView();
         });
     }
@@ -317,15 +318,25 @@ const CrowdsourceReporter = class {
             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 (index.h(index.Host, { key: 'fbe7fdc13c462e0fe155107ac784f03b3922d624' }, this._reportSubmitted && index.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" }, index.h("div", { key: '7b81a7c8b3d66159a790ab3d13be9f1b65a6202e', slot: "message" }, this.reportSubmittedMessage ? this.reportSubmittedMessage : this._translations.submitMsg)), this._featureCreationFailedErrorMsg && index.h("calcite-alert", { key: 'ee2f17e3326ef7c60fb2ee06ed313fd28cf7084a', "auto-close": true, class: themeClass, icon: "x-octagon", kind: "danger", label: "", onCalciteAlertClose: () => { this._featureCreationFailedErrorMsg = ""; }, open: true, placement: "top" }, index.h("div", { key: 'b356832ee6d4d16a84cdea0abb6b1c677f9ca1f6', slot: "title" }, this._translations.error), index.h("div", { key: '8aa16df1114b75b6a3e2a76de7fb5c7cbc5d3632', slot: "message" }, this._featureCreationFailedErrorMsg)), this._commentSubmitted && index.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" }, index.h("div", { key: '58ccda0d3782dbe70d346b973b7648f8ae4c8c8f', slot: "message" }, this.commentSubmittedMessage || this._translations.commentSubmittedMsg)), this._addingCommentFailed && index.h("calcite-alert", { key: 'e49e9e3b33df17dd90b3263bec6c17566f6f7b1b', "auto-close": true, class: themeClass, icon: "x-octagon", kind: "danger", label: "", onCalciteAlertClose: () => { this._addingCommentFailed = false; }, open: true, placement: "top" }, index.h("div", { key: 'cfb88dd323ead1398cd73849f68a9c2846ef9d14', slot: "title" }, this._translations.error), index.h("div", { key: 'b27e8983a74c8613e569400b7c7ad0b14d43f323', slot: "message" }, this._translations.addingCommentFailedMsg)), index.h("div", { key: '7ac3d49d6383d2a88e54d91fa00e2c81aa91a890' }, index.h("calcite-shell", { key: '709e673f4e9261b4283c7593926d605c8a049abd', "content-behind": true }, this._getReporter()))));
+        return (index.h(index.Host, { key: 'f1dd6d85210210a73fff30a5d98370da1834be7b' }, this._reportSubmitted && index.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" }, index.h("div", { key: '27aa04dd8575ad27898f7848bc2733a03a33e70f', slot: "message" }, this.reportSubmittedMessage ? this.reportSubmittedMessage : this._translations.submitMsg)), this._featureCreationFailedErrorMsg && index.h("calcite-alert", { key: '3fc2721bed573ad10bbb1c81af126e2e8ca90b12', "auto-close": true, class: themeClass, icon: "x-octagon", kind: "danger", label: "", onCalciteAlertClose: () => { this._featureCreationFailedErrorMsg = ""; }, open: true, placement: "top" }, index.h("div", { key: '4993e5c5b52d650b094c2890d0e4516cc87ffb69', slot: "title" }, this._translations.error), index.h("div", { key: '272b17f4c0239d8b295d6f2c0c02f1ba236d840d', slot: "message" }, this._featureCreationFailedErrorMsg)), this._commentSubmitted && index.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" }, index.h("div", { key: 'bd428297f5fe85cbf7edc42c61c64c299d7954b7', slot: "message" }, this.commentSubmittedMessage || this._translations.commentSubmittedMsg)), this._addingCommentFailed && index.h("calcite-alert", { key: '2aa1927ca27f9ec15a16f8e68905a1cf203ef833', "auto-close": true, class: themeClass, icon: "x-octagon", kind: "danger", label: "", onCalciteAlertClose: () => { this._addingCommentFailed = false; }, open: true, placement: "top" }, index.h("div", { key: '4bff5fb03586edf0f9ea21649d1de4c34034e539', slot: "title" }, this._translations.error), index.h("div", { key: '7ea6c71dbbac15c2f43242ba00c9e461177051a1', slot: "message" }, this._translations.addingCommentFailedMsg)), index.h("div", { key: '3aa6bfc19a1e82ab90d2ab42aa9a577b3a2b6d8f' }, index.h("calcite-shell", { key: 'f27355d4f655c0a0931158f38f0be3eb28f6c4d4', "content-behind": true }, this._getReporter()))));
     }
     //--------------------------------------------------------------------------
     //
@@ -389,7 +400,6 @@ const CrowdsourceReporter = class {
                     break;
                 case "filter-panel":
                     renderLists.push(this.getFilterPanel());
-                    void this._restoreFilters();
                     break;
                 case "feature-details":
                     renderLists.push(this.getFeatureDetailsFlowItem());
@@ -436,20 +446,6 @@ const CrowdsourceReporter = class {
         return (index.h("calcite-popover", { autoClose: true, label: "", offsetDistance: 0, placement: this.isMobile ? "leading-start" : "bottom-start", pointerDisabled: true, referenceElement: "sort-popover" }, index.h("calcite-list", { "selection-mode": "single" }, index.h("calcite-list-item", { label: this._translations.sortNewest, onCalciteListItemSelect: () => { void this.sortOptionClick(this._selectedLayer.objectIdField, "desc", "sortNewest"); }, selected: this._updatedSortOption === "sortNewest", value: "sortNewest" }), index.h("calcite-list-item", { label: this._translations.sortOldest, onCalciteListItemSelect: () => { void this.sortOptionClick(this._selectedLayer.objectIdField, "asc", "sortOldest"); }, selected: this._updatedSortOption === "sortOldest", value: "sortOldest" }), canSortByVotes &&
             index.h(index.Fragment, null, index.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" }), index.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
@@ -457,8 +453,6 @@ const CrowdsourceReporter = class {
     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
@@ -466,9 +460,7 @@ const CrowdsourceReporter = class {
      */
     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;
     }
@@ -635,10 +627,6 @@ const CrowdsourceReporter = class {
         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();
@@ -710,28 +698,18 @@ const CrowdsourceReporter = class {
         };
         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 mapViewUtils.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();
     }
@@ -846,9 +824,8 @@ const CrowdsourceReporter = class {
      * @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 (index.h("calcite-flow-item", { collapsed: this.isMobile && this._sidePanelCollapsed, heading: layerName, loading: this._showLoadingIndicator, onCalciteFlowItemBack: this.backFromSelectedPanel.bind(this) }, this._toggleSort(), index.h("calcite-action", { icon: "sort-ascending-arrow", id: "sort-popover", slot: "header-actions-end", text: this._translations.sort, title: this._translations.sort }), showFilterIcon && index.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 &&
             index.h("calcite-button", { appearance: "solid", onClick: this.navigateToCreateFeature.bind(this), slot: "footer", width: "full" }, this.reportButtonText ? this.reportButtonText : this._translations.createReportButtonText), index.h("calcite-panel", { "full-height": true }, index.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 }))));
     }
@@ -858,8 +835,7 @@ const CrowdsourceReporter = class {
      * @protected
      */
     getFilterPanel() {
-        const currentLayersExpressions = this.layerExpressions ? this.layerExpressions.filter((exp) => exp.id === this._selectedLayerId) : [];
-        return (index.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(), index.h("div", { class: "width-full", slot: "footer" }, index.h("div", { class: "width-full", slot: "footer" }, index.h("calcite-button", { appearance: "solid", class: "footer-top-button footer-button", disabled: !this._filterActive, onClick: () => { void this._filterList?.forceReset(); }, width: "full" }, this._translations.resetFilter), index.h("calcite-button", { appearance: "outline", class: "footer-button", onClick: this.backFromFilterPanel.bind(this), width: "full" }, this._translations.close))), index.h("calcite-panel", { "full-height": true }, index.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 (index.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(), index.h("div", { class: "width-full", slot: "footer" }, index.h("div", { class: "width-full", slot: "footer" }, index.h("calcite-button", { appearance: "solid", class: "footer-top-button footer-button", disabled: !this._filterActive, onClick: this.resetFilterList.bind(this), width: "full" }, this._translations.resetFilter), index.h("calcite-button", { appearance: "outline", class: "footer-button", onClick: this.backFromFilterPanel.bind(this), width: "full" }, this._translations.close))), index.h("calcite-panel", { "full-height": true }, index.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
@@ -919,6 +895,7 @@ const CrowdsourceReporter = class {
         else {
             if (this._editableLayerIds.length > 1) {
                 void this.setSelectedLayer('', '');
+                void this.handlePrevLayersFilter();
             }
             this._currentFeatureId = '';
         }
@@ -1175,7 +1152,8 @@ const CrowdsourceReporter = class {
             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
@@ -1235,6 +1213,91 @@ const CrowdsourceReporter = class {
             }
         }
     }
+    /**
+     * 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 mapViewUtils.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/cjs/{helpers-afcac967.js → helpers-0493759d.js}

@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const loadModules = require('./loadModules-8567855e.js');
+const loadModules = require('./loadModules-df8b13ca.js');
 const index = require('./index-2b13a4d5.js');
 
 async function getMergedEffect(presetLayerEffect, featureLayerView, type) {

package/dist/cjs/instant-apps-app-guide.cjs.entry.js

@@ -8,8 +8,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const index = require('./index-4b68e4b4.js');
-const locale = require('./locale-4a18a858.js');
-require('./loadModules-8567855e.js');
+const locale = require('./locale-4b820602.js');
+require('./loadModules-df8b13ca.js');
 require('./esri-loader-08dc41bd.js');
 require('./_commonjsHelpers-baf43783.js');
 require('./languageUtil-a3e1eafd.js');

package/dist/cjs/instant-apps-ckeditor-wrapper_3.cjs.entry.js

@@ -8,9 +8,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const index = require('./index-4b68e4b4.js');
-const utils = require('./utils-fa7ad44b.js');
-require('./locale-4a18a858.js');
-require('./loadModules-8567855e.js');
+const utils = require('./utils-3f10ea6b.js');
+require('./locale-4b820602.js');
+require('./loadModules-df8b13ca.js');
 require('./esri-loader-08dc41bd.js');
 require('./_commonjsHelpers-baf43783.js');
 require('./languageUtil-a3e1eafd.js');

package/dist/cjs/instant-apps-control-panel.cjs.entry.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const index = require('./index-4b68e4b4.js');
-const loadModules = require('./loadModules-8567855e.js');
+const loadModules = require('./loadModules-df8b13ca.js');
 require('./esri-loader-08dc41bd.js');
 require('./_commonjsHelpers-baf43783.js');
 

package/dist/cjs/instant-apps-create.cjs.entry.js

@@ -8,8 +8,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const index = require('./index-4b68e4b4.js');
-const locale = require('./locale-4a18a858.js');
-const loadModules = require('./loadModules-8567855e.js');
+const locale = require('./locale-4b820602.js');
+const loadModules = require('./loadModules-df8b13ca.js');
 const mode = require('./mode-3478ba36.js');
 require('./languageUtil-a3e1eafd.js');
 require('./esri-loader-08dc41bd.js');

package/dist/cjs/instant-apps-export-views.cjs.entry.js

@@ -8,8 +8,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const index = require('./index-4b68e4b4.js');
-const loadModules = require('./loadModules-8567855e.js');
-const locale = require('./locale-4a18a858.js');
+const loadModules = require('./loadModules-df8b13ca.js');
+const locale = require('./locale-4b820602.js');
 const mode = require('./mode-3478ba36.js');
 require('./esri-loader-08dc41bd.js');
 require('./_commonjsHelpers-baf43783.js');