@esri/solutions-components 0.7.49 → 0.7.51

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

@@ -136,8 +136,17 @@ const FloorFilter = class {
     //
     //--------------------------------------------------------------------------
     async mapViewWatchHandler() {
-        await this.mapView.when(() => {
-            this._initFloorFilter(this.mapView);
+        const webMap = this.mapView.map;
+        await webMap.when(() => {
+            if (this.floorFilterWidget) {
+                this.floorFilterWidget.destroy();
+                this.floorFilterWidget = undefined;
+            }
+            if (this._floorFilterElement) {
+                this._floorFilterElement.remove();
+                this._floorFilterElement = document.createElement("div");
+            }
+            this._initFloorFilter(this.mapView, webMap);
         });
     }
     //--------------------------------------------------------------------------
@@ -177,30 +186,25 @@ const FloorFilter = class {
     /**
      * Initialize the floor filter or reset the current view if it already exists
      */
-    _initFloorFilter(view) {
-        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
-                });
-                (_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.viewModel.view = view;
-            }
+    _initFloorFilter(view, webMap) {
+        var _a, _b, _c;
+        if (view && this.enabled && this.FloorFilter && (webMap === null || webMap === void 0 ? void 0 : webMap.floorInfo)) {
+            this.floorFilterWidget = new this.FloorFilter({
+                container: this._floorFilterElement,
+                view
+            });
+            (_a = this._facilityHandle) === null || _a === void 0 ? void 0 : _a.remove();
+            this._facilityHandle = this.reactiveUtils.watch(() => this.floorFilterWidget.facility, (facility) => {
+                this.facilityChanged.emit(facility);
+            });
+            (_b = this._levelHandle) === null || _b === void 0 ? void 0 : _b.remove();
+            this._levelHandle = this.reactiveUtils.watch(() => this.floorFilterWidget.level, (level) => {
+                this.levelChanged.emit(level);
+            });
+            (_c = this._siteHandle) === null || _c === void 0 ? void 0 : _c.remove();
+            this._siteHandle = this.reactiveUtils.watch(() => this.floorFilterWidget.site, (site) => {
+                this.siteChanged.emit(site);
+            });
         }
     }
     get el() { return index.getElement(this); }

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

@@ -149,7 +149,6 @@ const LayerTable = class {
         this.onTableNodeCreate = (node) => {
             this._tableNode = node;
         };
-        this.defaultFilter = undefined;
         this.defaultGlobalId = undefined;
         this.defaultLayerId = undefined;
         this.defaultOid = undefined;
@@ -185,6 +184,18 @@ const LayerTable = class {
     //  Watch handlers
     //
     //--------------------------------------------------------------------------
+    /**
+     * Handle url defaults when defaultOid is set
+     */
+    async defaultOidWatchHandler() {
+        await this._handleDefaults();
+    }
+    /**
+     * Handle url defaults when defaultGlobalId is set
+     */
+    async defaultGlobalIdWatchHandler() {
+        await this._handleDefaults();
+    }
     /**
      * Reset the toolInfos when export csv is enabled/disabled
      */
@@ -872,22 +883,6 @@ const LayerTable = class {
         else {
             urlObj.searchParams.delete("oid");
         }
-        if (this._filterActive) {
-            const filter = JSON.parse(this._filterList.urlParams.get("filter"));
-            const layerExpressions = this._filterList.layerExpressions.map(layerExp => {
-                layerExp.expressions = layerExp.expressions.map(exp => {
-                    if (exp.id.toString() === filter.expressionId.toString()) {
-                        exp.active = true;
-                    }
-                    return exp;
-                });
-                return layerExp;
-            });
-            urlObj.searchParams.set("filter", JSON.stringify(layerExpressions));
-        }
-        else {
-            urlObj.searchParams.delete("filter");
-        }
         this._shareNode.shareUrl = urlObj.href;
     }
     /**
@@ -901,7 +896,7 @@ const LayerTable = class {
      * @returns VNode The tooltip node
      */
     _getToolTip(placement, referenceElement, text) {
-        return (index.h("calcite-tooltip", { placement: placement, "reference-element": referenceElement }, index.h("span", null, text)));
+        return document.getElementById(referenceElement) ? (index.h("calcite-tooltip", { placement: placement, "reference-element": referenceElement }, index.h("span", null, text))) : undefined;
     }
     /**
      * Get an id with a prefix to the user supplied value
@@ -1064,7 +1059,11 @@ const LayerTable = class {
     _resetColumnTemplates() {
         var _a, _b;
         const columnTemplates = this._getColumnTemplates((_a = this._layer) === null || _a === void 0 ? void 0 : _a.id, (_b = this._layer) === null || _b === void 0 ? void 0 : _b.fields);
-        if (this._table && columnTemplates) {
+        const hasChange = columnTemplates === null || columnTemplates === void 0 ? void 0 : columnTemplates.some((ct, i) => {
+            var _a;
+            return JSON.stringify((_a = this._table) === null || _a === void 0 ? void 0 : _a.tableTemplate.columnTemplates[i]) !== JSON.stringify(ct);
+        });
+        if (this._table && columnTemplates && hasChange) {
             this._table.tableTemplate = new this.TableTemplate({
                 columnTemplates
             });
@@ -1087,37 +1086,67 @@ const LayerTable = class {
             this._table.view = this.mapView;
             this._table.layer = this._layer;
         }
+        await this._initLayerRefresh();
         this._checkEditEnabled();
         this._table.editingEnabled = this._editEnabled && this.enableInlineEdit;
         await this.reactiveUtils.once(() => this._table.state === "loaded")
             .then(async () => {
-            var _a, _b, _c;
             this._table.highlightIds.removeAll();
             this._table.clearSelectionFilter();
             this._resetColumnTemplates();
-            if (!this._defaultOidHonored && ((_a = this.defaultOid) === null || _a === void 0 ? void 0 : _a.length) > 0 && this.defaultOid[0] > -1) {
-                this._selectDefaultFeature(this.defaultOid);
-                this._defaultOidHonored = true;
-            }
-            if (!this._defaultGlobalIdHonored && ((_b = this.defaultGlobalId) === null || _b === void 0 ? void 0 : _b.length) > 0) {
-                const features = await mapViewUtils.queryFeaturesByGlobalID(this.defaultGlobalId, this._layer);
-                const oids = (features === null || features === void 0 ? void 0 : features.length) > 0 ? features.map(f => f.getObjectId()) : undefined;
-                if (oids) {
-                    this._selectDefaultFeature(oids);
-                }
-                this._defaultGlobalIdHonored = true;
-            }
-            if (!this._defaultFilterHonored && ((_c = this.defaultFilter) === null || _c === void 0 ? void 0 : _c.length) > 0 && this._filterList) {
-                this._layerExpressions = this.defaultFilter;
-                this._filterActive = true;
-                this._defaultFilterHonored = true;
-            }
             this._showOnlySelected = false;
+            await this._handleDefaults();
             await this._sortTable();
             this._initToolInfos();
             this._updateToolbar();
         });
     }
+    /**
+     * Update the current IDs when that layers data is modified
+     */
+    async _initLayerRefresh() {
+        if (this._refreshHandle) {
+            this._refreshHandle.remove();
+        }
+        this._refreshHandle = this._layer.on("refresh", (evt) => {
+            if (evt.dataChanged) {
+                this._skipOnChange = true;
+                void this._updateAllIds();
+            }
+        });
+    }
+    /**
+     * Reset _allIds when the layers data has changed and refresh the selection ids and table
+     */
+    async _updateAllIds() {
+        this._allIds = await mapViewUtils.queryAllIds(this._layer);
+        this.selectedIds = this.selectedIds.filter(id => this._allIds.indexOf(id) > -1);
+        await this._refresh();
+    }
+    /**
+     * Handle default OID or GlobalID from url parameters
+     */
+    async _handleDefaults() {
+        var _a, _b;
+        if (!this._defaultOidHonored && ((_a = this.defaultOid) === null || _a === void 0 ? void 0 : _a.length) > 0 && this.defaultOid[0] > -1 && this._table) {
+            await this._selectDefaultFeature(this.defaultOid);
+            this._defaultOidHonored = true;
+            this.defaultOid = undefined;
+            this._showOnlySelected = false;
+            this._toggleShowSelected();
+        }
+        if (!this._defaultGlobalIdHonored && ((_b = this.defaultGlobalId) === null || _b === void 0 ? void 0 : _b.length) > 0 && this._table) {
+            const features = await mapViewUtils.queryFeaturesByGlobalID(this.defaultGlobalId, this._layer);
+            const oids = (features === null || features === void 0 ? void 0 : features.length) > 0 ? features.map(f => f.getObjectId()) : undefined;
+            if (oids) {
+                await this._selectDefaultFeature(oids);
+            }
+            this._defaultGlobalIdHonored = true;
+            this.defaultGlobalId = undefined;
+            this._showOnlySelected = false;
+            this._toggleShowSelected();
+        }
+    }
     /**
      * Store the column names and current hidden status to support show/hide of columns
      * @param fieldNames optional list of names from new config options
@@ -1146,13 +1175,12 @@ const LayerTable = class {
     /**
      * Select the feature that was specified via url params
      */
-    _selectDefaultFeature(oids) {
+    async _selectDefaultFeature(oids) {
         if (oids.length > 0) {
             this._table.highlightIds.addMany(oids);
-            void this._table.when(() => {
-                const i = this._table.viewModel.getObjectIdIndex(oids[0]);
-                this._table.viewModel.scrollToIndex(i);
-            });
+            // This is messed up and only make this worse
+            //const i = this._table.viewModel.getObjectIdIndex(oids[0]);
+            //this._table.viewModel.scrollToIndex(i);
         }
     }
     /**
@@ -1528,6 +1556,8 @@ const LayerTable = class {
     }
     get el() { return index.getElement(this); }
     static get watchers() { return {
+        "defaultOid": ["defaultOidWatchHandler"],
+        "defaultGlobalId": ["defaultGlobalIdWatchHandler"],
         "enableCSV": ["enableCSVWatchHandler"],
         "enableInlineEdit": ["enableInlineEditWatchHandler"],
         "enableShare": ["enableShareWatchHandler"],

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

@@ -19,13 +19,27 @@ const crowdsourceManagerCss = ":host{display:block;--calcite-label-margin-bottom
 const CrowdsourceManager = class {
     constructor(hostRef) {
         index.registerInstance(this, hostRef);
+        //--------------------------------------------------------------------------
+        //
+        //  Properties (protected)
+        //
+        //--------------------------------------------------------------------------
+        /**
+         * boolean: When true the map view will be set after render due to popup obstructing the view
+         * MapView.when is not fired when mapView is not currently visible
+         */
+        this._defaultCenterHonored = false;
+        /**
+         * boolean: When true the map view will be set after render due to popup obstructing the view
+         * MapView.when is not fired when mapView is not currently visible
+         */
+        this._defaultLevelHonored = false;
         /**
          * boolean: When true the map view will be set after render due to popup obstructing the view
          * MapView.when is not fired when mapView is not currently visible
          */
         this._shouldSetMapView = false;
         this.defaultCenter = "";
-        this.defaultFilter = "";
         this.defaultGlobalId = "";
         this.defaultLayer = "";
         this.defaultLevel = "";
@@ -70,39 +84,6 @@ const CrowdsourceManager = class {
     //  Watch handlers
     //
     //--------------------------------------------------------------------------
-    /**
-     * Watch for center url param to be set
-     */
-    defaultCenterWatchHandler() {
-        this._defaultCenter = !this.defaultCenter ? undefined :
-            this.defaultCenter.split(";").map(v => parseFloat(v));
-    }
-    /**
-     * Watch for filter url param to be set
-     */
-    defaultFilterWatchHandler() {
-        this._defaultFilter = JSON.parse(this.defaultFilter);
-    }
-    /**
-     * Watch for globalid url param to be set
-     */
-    defaultGlobalIdWatchHandler() {
-        this._defaultGlobalId = !this.defaultGlobalId ? undefined :
-            this.defaultGlobalId.indexOf(",") > -1 ? this.defaultGlobalId.split(",") : [this.defaultGlobalId];
-    }
-    /**
-     * Watch for oid url param to be set
-     */
-    defaultOidWatchHandler() {
-        this._defaultOid = !this.defaultOid ? undefined :
-            this.defaultOid.indexOf(",") > -1 ? this.defaultOid.split(",").map(o => parseInt(o, 10)) : [parseInt(this.defaultOid, 10)];
-    }
-    /**
-     * Watch for zoom level param to be set
-     */
-    defaultLevelWatchHandler() {
-        this._defaultLevel = !this.defaultLevel ? undefined : parseInt(this.defaultLevel, 10);
-    }
     /**
      * When true the map zoom tools will be available
      */
@@ -394,6 +375,7 @@ const CrowdsourceManager = class {
      * @protected
      */
     _getTable(layoutMode, panelOpen, hideTable) {
+        var _a, _b;
         const tableClass = hideTable && this._isMobile ? "visibility-hidden" : "";
         const tableSizeClass = this._getTableSizeClass(layoutMode, panelOpen);
         const icon = this._getDividerIcon(layoutMode, panelOpen);
@@ -402,7 +384,11 @@ const CrowdsourceManager = class {
         const toggleLayout = layoutMode === interfaces.ELayoutMode.HORIZONTAL ? "horizontal" : "vertical";
         const toggleSlot = layoutMode === interfaces.ELayoutMode.HORIZONTAL ? "header" : "panel-start";
         const hasMapAndLayer = this.defaultWebmap && this.defaultLayer;
-        return (index.h("calcite-shell", { class: `${tableSizeClass} ${tableClass} border-bottom` }, !this._isMobile ? (index.h("calcite-action-bar", { class: "border-sides", expandDisabled: true, layout: toggleLayout, slot: toggleSlot }, index.h("calcite-action", { class: "toggle-node", icon: icon, id: id, onClick: () => this._toggleLayout(), text: "" }), index.h("calcite-tooltip", { label: tooltip, placement: "bottom", "reference-element": id }, index.h("span", null, tooltip)))) : undefined, index.h("div", { class: `width-full height-full position-relative` }, index.h("layer-table", { defaultFilter: hasMapAndLayer ? this._defaultFilter : undefined, defaultGlobalId: hasMapAndLayer ? this._defaultGlobalId : undefined, defaultLayerId: hasMapAndLayer ? this.defaultLayer : "", defaultOid: hasMapAndLayer && !this.defaultGlobalId ? this._defaultOid : undefined, enableAutoRefresh: this.enableAutoRefresh, enableCSV: this.enableCSV, enableColumnReorder: this.enableColumnReorder, enableInlineEdit: this.enableInlineEdit, enableShare: this.enableShare, isMobile: this._isMobile, mapInfo: this._mapInfo, mapView: this === null || this === void 0 ? void 0 : this._mapView, onlyShowUpdatableLayers: this.onlyShowUpdatableLayers, ref: (el) => this._layerTable = el, shareIncludeEmbed: this.shareIncludeEmbed, shareIncludeSocial: this.shareIncludeSocial, showNewestFirst: this.showNewestFirst, zoomAndScrollToSelected: this.zoomAndScrollToSelected }))));
+        const globalId = !this.defaultGlobalId ? undefined :
+            ((_a = this.defaultGlobalId) === null || _a === void 0 ? void 0 : _a.indexOf(",")) > -1 ? this.defaultGlobalId.split(",") : [this.defaultGlobalId];
+        const defaultOid = !this.defaultOid ? undefined :
+            ((_b = this.defaultOid) === null || _b === void 0 ? void 0 : _b.indexOf(",")) > -1 ? this.defaultOid.split(",").map(o => parseInt(o, 10)) : [parseInt(this.defaultOid, 10)];
+        return (index.h("calcite-shell", { class: `${tableSizeClass} ${tableClass} border-bottom` }, !this._isMobile ? (index.h("calcite-action-bar", { class: "border-sides", expandDisabled: true, layout: toggleLayout, slot: toggleSlot }, index.h("calcite-action", { class: "toggle-node", icon: icon, id: id, onClick: () => this._toggleLayout(), text: "" }), index.h("calcite-tooltip", { label: tooltip, placement: "bottom", "reference-element": id }, index.h("span", null, tooltip)))) : undefined, index.h("div", { class: `width-full height-full position-relative` }, index.h("layer-table", { defaultGlobalId: hasMapAndLayer ? globalId : undefined, defaultLayerId: hasMapAndLayer ? this.defaultLayer : "", defaultOid: hasMapAndLayer && !globalId ? defaultOid : undefined, enableAutoRefresh: this.enableAutoRefresh, enableCSV: this.enableCSV, enableColumnReorder: this.enableColumnReorder, enableInlineEdit: this.enableInlineEdit, enableShare: this.enableShare, isMobile: this._isMobile, mapInfo: this._mapInfo, mapView: this === null || this === void 0 ? void 0 : this._mapView, onlyShowUpdatableLayers: this.onlyShowUpdatableLayers, ref: (el) => this._layerTable = el, shareIncludeEmbed: this.shareIncludeEmbed, shareIncludeSocial: this.shareIncludeSocial, showNewestFirst: this.showNewestFirst, zoomAndScrollToSelected: this.zoomAndScrollToSelected }))));
     }
     /**
      * Update the component layout when its size changes
@@ -455,17 +441,22 @@ const CrowdsourceManager = class {
      * @protected
      */
     async _setMapView() {
+        var _a;
         this._mapInfo = this._getMapInfo(this._mapChange.id);
         this._mapView = this._mapChange.mapView;
         this._initMapZoom();
         this._mapView.popupEnabled = false;
-        if (this._defaultCenter && this._defaultLevel) {
+        const center = !this.defaultCenter || this._defaultCenterHonored ?
+            undefined : (_a = this.defaultCenter) === null || _a === void 0 ? void 0 : _a.split(";").map(v => parseFloat(v));
+        const zoom = !this.defaultLevel || this._defaultLevelHonored ?
+            undefined : parseInt(this.defaultLevel, 10);
+        if (center && zoom) {
             await this._mapView.goTo({
-                center: this._defaultCenter,
-                zoom: this._defaultLevel
+                center,
+                zoom
             });
-            this._defaultCenter = undefined;
-            this._defaultLevel = undefined;
+            this._defaultCenterHonored = true;
+            this._defaultLevelHonored = true;
         }
     }
     /**
@@ -497,11 +488,6 @@ const CrowdsourceManager = class {
     }
     get el() { return index.getElement(this); }
     static get watchers() { return {
-        "defaultCenter": ["defaultCenterWatchHandler"],
-        "defaultFilter": ["defaultFilterWatchHandler"],
-        "defaultGlobalId": ["defaultGlobalIdWatchHandler"],
-        "defaultOid": ["defaultOidWatchHandler"],
-        "defaultLevel": ["defaultLevelWatchHandler"],
         "enableZoom": ["enableZoomWatchHandler"]
     }; }
 };