@esri/solutions-components 0.7.47 → 0.7.48

package/dist/collection/components/floor-filter/floor-filter.js

@@ -74,22 +74,28 @@ export class FloorFilter {
      * Initialize the floor filter or reset the current view if it already exists
      */
     _initFloorFilter(view) {
-        var _a;
+        var _a, _b, _c, _d;
         if (view && this.enabled && this.FloorFilter && ((_a = view === null || view === void 0 ? void 0 : view.map) === null || _a === void 0 ? void 0 : _a.floorInfo)) {
             if (!this.floorFilterWidget) {
                 this.floorFilterWidget = new this.FloorFilter({
                     container: this._floorFilterElement,
                     view
                 });
-                if (this._levelHandle) {
-                    this._levelHandle.remove();
-                }
+                (_b = this._facilityHandle) === null || _b === void 0 ? void 0 : _b.remove();
+                this._facilityHandle = this.reactiveUtils.watch(() => this.floorFilterWidget.facility, (facility) => {
+                    this.facilityChanged.emit(facility);
+                });
+                (_c = this._levelHandle) === null || _c === void 0 ? void 0 : _c.remove();
                 this._levelHandle = this.reactiveUtils.watch(() => this.floorFilterWidget.level, (level) => {
                     this.levelChanged.emit(level);
                 });
+                (_d = this._siteHandle) === null || _d === void 0 ? void 0 : _d.remove();
+                this._siteHandle = this.reactiveUtils.watch(() => this.floorFilterWidget.site, (site) => {
+                    this.siteChanged.emit(site);
+                });
             }
             else {
-                this.floorFilterWidget.view = view;
+                this.floorFilterWidget.viewModel.view = view;
             }
         }
     }
@@ -168,6 +174,21 @@ export class FloorFilter {
     }
     static get events() {
         return [{
+                "method": "facilityChanged",
+                "name": "facilityChanged",
+                "bubbles": true,
+                "cancelable": true,
+                "composed": true,
+                "docs": {
+                    "tags": [],
+                    "text": "Emitted on demand when the Facility is changed"
+                },
+                "complexType": {
+                    "original": "string",
+                    "resolved": "string",
+                    "references": {}
+                }
+            }, {
                 "method": "levelChanged",
                 "name": "levelChanged",
                 "bubbles": true,
@@ -182,6 +203,21 @@ export class FloorFilter {
                     "resolved": "string",
                     "references": {}
                 }
+            }, {
+                "method": "siteChanged",
+                "name": "siteChanged",
+                "bubbles": true,
+                "cancelable": true,
+                "composed": true,
+                "docs": {
+                    "tags": [],
+                    "text": "Emitted on demand when the Site is changed"
+                },
+                "complexType": {
+                    "original": "string",
+                    "resolved": "string",
+                    "references": {}
+                }
             }];
     }
     static get elementRef() { return "el"; }

package/dist/collection/components/layer-table/layer-table.js

@@ -167,6 +167,7 @@ export class LayerTable {
             this._mapClickHandle.remove();
         }
         if (this.mapView) {
+            this._floorExpression = undefined;
             this._updateShareUrl();
             this._mapClickHandle = this.reactiveUtils.on(() => this.mapView, "click", (event) => {
                 void this._mapClicked(event);
@@ -235,6 +236,13 @@ export class LayerTable {
         }
         await this._refresh();
     }
+    /**
+     * Refresh the table when floor filter facility is changed
+     */
+    async facilityChanged(evt) {
+        this._floorFacility = evt.detail;
+        this._updateFloorDefinitionExpression();
+    }
     /**
      * Refresh the table when floor filter level is changed
      */
@@ -242,6 +250,13 @@ export class LayerTable {
         this._floorLevel = evt.detail;
         this._updateFloorDefinitionExpression();
     }
+    /**
+     * Refresh the table when floor filter site is changed
+     */
+    async siteChanged(evt) {
+        this._floorSite = evt.detail;
+        this._updateFloorDefinitionExpression();
+    }
     /**
      * Refresh the table when
      */
@@ -538,7 +553,12 @@ export class LayerTable {
      */
     _updateFloorDefinitionExpression() {
         if (this._floorField && this._floorLevel) {
-            this._layer.definitionExpression = `${this._floorField} = '${this._floorLevel}'`;
+            const floorExp = `${this._floorField} = '${this._floorLevel}'`;
+            const defExp = this._layer.definitionExpression;
+            this._layer.definitionExpression = (defExp === null || defExp === void 0 ? void 0 : defExp.indexOf(this._floorExpression)) > -1 ?
+                defExp.replace(this._floorExpression, floorExp) :
+                defExp ? `${defExp} AND (${floorExp})` : floorExp;
+            this._floorExpression = floorExp;
         }
     }
     /**
@@ -1141,7 +1161,15 @@ export class LayerTable {
      * Check if the layers definitionExpression has been modified
      */
     _handleFilterUpdate() {
-        this._filterActive = this._definitionExpression !== this._layer.definitionExpression;
+        const defExp = this._layer.definitionExpression;
+        if (this._floorExpression) {
+            const regEx = new RegExp(`${this._floorField} = ['].+[']`, "gm");
+            this._layer.definitionExpression = defExp && this._floorField && defExp.indexOf(`${this._floorField} = '`) > -1 ?
+                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._updateShareUrl();
     }
     /**
@@ -1229,7 +1257,10 @@ export class LayerTable {
         const layerExpressions = (_b = (_a = this.mapInfo) === null || _a === void 0 ? void 0 : _a.filterConfig) === null || _b === void 0 ? void 0 : _b.layerExpressions;
         this._layerExpressions = layerExpressions ? layerExpressions.filter((exp) => { var _a; return exp.id === ((_a = this._layer) === null || _a === void 0 ? void 0 : _a.id); }) : [];
         this._filterList.layerExpressions = this._layerExpressions;
-        this._filterActive = false;
+        this._filterActive = this._layerExpressions.filter(lyrExp => {
+            console.log(lyrExp);
+            return lyrExp.expressions.filter(exp => exp.active).length > 0;
+        }).length > 0;
     }
     /**
      * Select all rows that are not currently selectd
@@ -1817,12 +1848,24 @@ export class LayerTable {
                 "target": "window",
                 "capture": false,
                 "passive": false
+            }, {
+                "name": "facilityChanged",
+                "method": "facilityChanged",
+                "target": "window",
+                "capture": false,
+                "passive": false
             }, {
                 "name": "levelChanged",
                 "method": "levelChanged",
                 "target": "window",
                 "capture": false,
                 "passive": false
+            }, {
+                "name": "siteChanged",
+                "method": "siteChanged",
+                "target": "window",
+                "capture": false,
+                "passive": false
             }, {
                 "name": "noLayersFound",
                 "method": "noLayersFound",

package/dist/collection/demos/crowdsource-manager.html

@@ -38,6 +38,12 @@
   <script type="module" src="../solutions-components.esm.js"></script>
 
   <script>
+    // require(["esri/config"], (
+    //   esriConfig
+    // ) => {
+    //   esriConfig.portalUrl = "https://holistic.mapsdevext.arcgis.com";
+    // });
+
     function addValues() {
       const demo = document.getElementById("demo");
 

package/dist/components/floor-filter2.js

@@ -13,7 +13,9 @@ const FloorFilter = /*@__PURE__*/ proxyCustomElement(class FloorFilter extends H
         super();
         this.__registerHost();
         this.__attachShadow();
+        this.facilityChanged = createEvent(this, "facilityChanged", 7);
         this.levelChanged = createEvent(this, "levelChanged", 7);
+        this.siteChanged = createEvent(this, "siteChanged", 7);
         this.enabled = undefined;
         this.floorFilterWidget = undefined;
         this.mapView = undefined;
@@ -66,22 +68,28 @@ const FloorFilter = /*@__PURE__*/ proxyCustomElement(class FloorFilter extends H
      * Initialize the floor filter or reset the current view if it already exists
      */
     _initFloorFilter(view) {
-        var _a;
+        var _a, _b, _c, _d;
         if (view && this.enabled && this.FloorFilter && ((_a = view === null || view === void 0 ? void 0 : view.map) === null || _a === void 0 ? void 0 : _a.floorInfo)) {
             if (!this.floorFilterWidget) {
                 this.floorFilterWidget = new this.FloorFilter({
                     container: this._floorFilterElement,
                     view
                 });
-                if (this._levelHandle) {
-                    this._levelHandle.remove();
-                }
+                (_b = this._facilityHandle) === null || _b === void 0 ? void 0 : _b.remove();
+                this._facilityHandle = this.reactiveUtils.watch(() => this.floorFilterWidget.facility, (facility) => {
+                    this.facilityChanged.emit(facility);
+                });
+                (_c = this._levelHandle) === null || _c === void 0 ? void 0 : _c.remove();
                 this._levelHandle = this.reactiveUtils.watch(() => this.floorFilterWidget.level, (level) => {
                     this.levelChanged.emit(level);
                 });
+                (_d = this._siteHandle) === null || _d === void 0 ? void 0 : _d.remove();
+                this._siteHandle = this.reactiveUtils.watch(() => this.floorFilterWidget.site, (site) => {
+                    this.siteChanged.emit(site);
+                });
             }
             else {
-                this.floorFilterWidget.view = view;
+                this.floorFilterWidget.viewModel.view = view;
             }
         }
     }

package/dist/components/layer-table2.js

@@ -196,6 +196,7 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
             this._mapClickHandle.remove();
         }
         if (this.mapView) {
+            this._floorExpression = undefined;
             this._updateShareUrl();
             this._mapClickHandle = this.reactiveUtils.on(() => this.mapView, "click", (event) => {
                 void this._mapClicked(event);
@@ -264,6 +265,13 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
         }
         await this._refresh();
     }
+    /**
+     * Refresh the table when floor filter facility is changed
+     */
+    async facilityChanged(evt) {
+        this._floorFacility = evt.detail;
+        this._updateFloorDefinitionExpression();
+    }
     /**
      * Refresh the table when floor filter level is changed
      */
@@ -271,6 +279,13 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
         this._floorLevel = evt.detail;
         this._updateFloorDefinitionExpression();
     }
+    /**
+     * Refresh the table when floor filter site is changed
+     */
+    async siteChanged(evt) {
+        this._floorSite = evt.detail;
+        this._updateFloorDefinitionExpression();
+    }
     /**
      * Refresh the table when
      */
@@ -567,7 +582,12 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
      */
     _updateFloorDefinitionExpression() {
         if (this._floorField && this._floorLevel) {
-            this._layer.definitionExpression = `${this._floorField} = '${this._floorLevel}'`;
+            const floorExp = `${this._floorField} = '${this._floorLevel}'`;
+            const defExp = this._layer.definitionExpression;
+            this._layer.definitionExpression = (defExp === null || defExp === void 0 ? void 0 : defExp.indexOf(this._floorExpression)) > -1 ?
+                defExp.replace(this._floorExpression, floorExp) :
+                defExp ? `${defExp} AND (${floorExp})` : floorExp;
+            this._floorExpression = floorExp;
         }
     }
     /**
@@ -1170,7 +1190,15 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
      * Check if the layers definitionExpression has been modified
      */
     _handleFilterUpdate() {
-        this._filterActive = this._definitionExpression !== this._layer.definitionExpression;
+        const defExp = this._layer.definitionExpression;
+        if (this._floorExpression) {
+            const regEx = new RegExp(`${this._floorField} = ['].+[']`, "gm");
+            this._layer.definitionExpression = defExp && this._floorField && defExp.indexOf(`${this._floorField} = '`) > -1 ?
+                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._updateShareUrl();
     }
     /**
@@ -1258,7 +1286,10 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
         const layerExpressions = (_b = (_a = this.mapInfo) === null || _a === void 0 ? void 0 : _a.filterConfig) === null || _b === void 0 ? void 0 : _b.layerExpressions;
         this._layerExpressions = layerExpressions ? layerExpressions.filter((exp) => { var _a; return exp.id === ((_a = this._layer) === null || _a === void 0 ? void 0 : _a.id); }) : [];
         this._filterList.layerExpressions = this._layerExpressions;
-        this._filterActive = false;
+        this._filterActive = this._layerExpressions.filter(lyrExp => {
+            console.log(lyrExp);
+            return lyrExp.expressions.filter(exp => exp.active).length > 0;
+        }).length > 0;
     }
     /**
      * Select all rows that are not currently selectd
@@ -1484,7 +1515,7 @@ const LayerTable = /*@__PURE__*/ proxyCustomElement(class LayerTable extends HTM
         "_showOnlySelected": [32],
         "_toolInfos": [32],
         "_translations": [32]
-    }, [[8, "selectionChanged", "selectionChanged"], [8, "editsComplete", "editsComplete"], [8, "levelChanged", "levelChanged"], [8, "noLayersFound", "noLayersFound"]], {
+    }, [[8, "selectionChanged", "selectionChanged"], [8, "editsComplete", "editsComplete"], [8, "facilityChanged", "facilityChanged"], [8, "levelChanged", "levelChanged"], [8, "siteChanged", "siteChanged"], [8, "noLayersFound", "noLayersFound"]], {
         "enableCSV": ["enableCSVWatchHandler"],
         "enableInlineEdit": ["enableInlineEditWatchHandler"],
         "enableShare": ["enableShareWatchHandler"],

package/dist/esm/basemap-gallery_7.entry.js

@@ -119,7 +119,9 @@ const floorFilterCss = ":host{display:block}";
 const FloorFilter = class {
     constructor(hostRef) {
         registerInstance(this, hostRef);
+        this.facilityChanged = createEvent(this, "facilityChanged", 7);
         this.levelChanged = createEvent(this, "levelChanged", 7);
+        this.siteChanged = createEvent(this, "siteChanged", 7);
         this.enabled = undefined;
         this.floorFilterWidget = undefined;
         this.mapView = undefined;
@@ -172,22 +174,28 @@ const FloorFilter = class {
      * Initialize the floor filter or reset the current view if it already exists
      */
     _initFloorFilter(view) {
-        var _a;
+        var _a, _b, _c, _d;
         if (view && this.enabled && this.FloorFilter && ((_a = view === null || view === void 0 ? void 0 : view.map) === null || _a === void 0 ? void 0 : _a.floorInfo)) {
             if (!this.floorFilterWidget) {
                 this.floorFilterWidget = new this.FloorFilter({
                     container: this._floorFilterElement,
                     view
                 });
-                if (this._levelHandle) {
-                    this._levelHandle.remove();
-                }
+                (_b = this._facilityHandle) === null || _b === void 0 ? void 0 : _b.remove();
+                this._facilityHandle = this.reactiveUtils.watch(() => this.floorFilterWidget.facility, (facility) => {
+                    this.facilityChanged.emit(facility);
+                });
+                (_c = this._levelHandle) === null || _c === void 0 ? void 0 : _c.remove();
                 this._levelHandle = this.reactiveUtils.watch(() => this.floorFilterWidget.level, (level) => {
                     this.levelChanged.emit(level);
                 });
+                (_d = this._siteHandle) === null || _d === void 0 ? void 0 : _d.remove();
+                this._siteHandle = this.reactiveUtils.watch(() => this.floorFilterWidget.site, (site) => {
+                    this.siteChanged.emit(site);
+                });
             }
             else {
-                this.floorFilterWidget.view = view;
+                this.floorFilterWidget.viewModel.view = view;
             }
         }
     }

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

@@ -248,6 +248,7 @@ const LayerTable = class {
             this._mapClickHandle.remove();
         }
         if (this.mapView) {
+            this._floorExpression = undefined;
             this._updateShareUrl();
             this._mapClickHandle = this.reactiveUtils.on(() => this.mapView, "click", (event) => {
                 void this._mapClicked(event);
@@ -316,6 +317,13 @@ const LayerTable = class {
         }
         await this._refresh();
     }
+    /**
+     * Refresh the table when floor filter facility is changed
+     */
+    async facilityChanged(evt) {
+        this._floorFacility = evt.detail;
+        this._updateFloorDefinitionExpression();
+    }
     /**
      * Refresh the table when floor filter level is changed
      */
@@ -323,6 +331,13 @@ const LayerTable = class {
         this._floorLevel = evt.detail;
         this._updateFloorDefinitionExpression();
     }
+    /**
+     * Refresh the table when floor filter site is changed
+     */
+    async siteChanged(evt) {
+        this._floorSite = evt.detail;
+        this._updateFloorDefinitionExpression();
+    }
     /**
      * Refresh the table when
      */
@@ -619,7 +634,12 @@ const LayerTable = class {
      */
     _updateFloorDefinitionExpression() {
         if (this._floorField && this._floorLevel) {
-            this._layer.definitionExpression = `${this._floorField} = '${this._floorLevel}'`;
+            const floorExp = `${this._floorField} = '${this._floorLevel}'`;
+            const defExp = this._layer.definitionExpression;
+            this._layer.definitionExpression = (defExp === null || defExp === void 0 ? void 0 : defExp.indexOf(this._floorExpression)) > -1 ?
+                defExp.replace(this._floorExpression, floorExp) :
+                defExp ? `${defExp} AND (${floorExp})` : floorExp;
+            this._floorExpression = floorExp;
         }
     }
     /**
@@ -1222,7 +1242,15 @@ const LayerTable = class {
      * Check if the layers definitionExpression has been modified
      */
     _handleFilterUpdate() {
-        this._filterActive = this._definitionExpression !== this._layer.definitionExpression;
+        const defExp = this._layer.definitionExpression;
+        if (this._floorExpression) {
+            const regEx = new RegExp(`${this._floorField} = ['].+[']`, "gm");
+            this._layer.definitionExpression = defExp && this._floorField && defExp.indexOf(`${this._floorField} = '`) > -1 ?
+                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._updateShareUrl();
     }
     /**
@@ -1310,7 +1338,10 @@ const LayerTable = class {
         const layerExpressions = (_b = (_a = this.mapInfo) === null || _a === void 0 ? void 0 : _a.filterConfig) === null || _b === void 0 ? void 0 : _b.layerExpressions;
         this._layerExpressions = layerExpressions ? layerExpressions.filter((exp) => { var _a; return exp.id === ((_a = this._layer) === null || _a === void 0 ? void 0 : _a.id); }) : [];
         this._filterList.layerExpressions = this._layerExpressions;
-        this._filterActive = false;
+        this._filterActive = this._layerExpressions.filter(lyrExp => {
+            console.log(lyrExp);
+            return lyrExp.expressions.filter(exp => exp.active).length > 0;
+        }).length > 0;
     }
     /**
      * Select all rows that are not currently selectd