@esri/solutions-components 0.7.47 → 0.7.48

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

@@ -123,7 +123,9 @@ const floorFilterCss = ":host{display:block}";
 const FloorFilter = class {
     constructor(hostRef) {
         index.registerInstance(this, hostRef);
+        this.facilityChanged = index.createEvent(this, "facilityChanged", 7);
         this.levelChanged = index.createEvent(this, "levelChanged", 7);
+        this.siteChanged = index.createEvent(this, "siteChanged", 7);
         this.enabled = undefined;
         this.floorFilterWidget = undefined;
         this.mapView = undefined;
@@ -176,22 +178,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/cjs/card-manager_3.cjs.entry.js

@@ -252,6 +252,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);
@@ -320,6 +321,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
      */
@@ -327,6 +335,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
      */
@@ -623,7 +638,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;
         }
     }
     /**
@@ -1226,7 +1246,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();
     }
     /**
@@ -1314,7 +1342,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