@arcgis/map-components 5.1.0-next.7 → 5.1.0-next.71

package/dist/components/arcgis-feature-utility-network-association-list/customElement.js

@@ -1,35 +1,39 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import { c as m } from "../../chunks/runtime.js";
-import { css as f, html as n } from "lit";
+import { c as f } from "../../chunks/runtime.js";
+import { css as g, html as n } from "lit";
 import { keyed as d } from "lit/directives/keyed.js";
-import { ArcgisUtilityNetworkAssociationList as g } from "../arcgis-utility-network-association-list/customElement.js";
+import { ArcgisUtilityNetworkAssociationList as y } from "../arcgis-utility-network-association-list/customElement.js";
 import { stripHTML as u } from "@arcgis/core/applications/Components/stringUtils.js";
-import { renderElement as p, safeClassMap as y } from "@arcgis/lumina";
 import { formatNumber as w, substitute as $ } from "@arcgis/core/intl.js";
-const b = f`:host{position:relative;flex:1 1 auto}.list-item--hidden{display:none}.feature-observer{bottom:var(--calcite-spacing-xxl);position:relative;text-align:center;z-index:2}.loading-container{display:flex;justify-content:center;padding:var(--calcite-spacing-md) 0;width:100%}.notice-container{margin-bottom:var(--calcite-spacing-xs)}`, _ = "nested";
-class A extends g {
+import { renderElement as p, safeClassMap as b } from "@arcgis/lumina";
+import { i as m } from "../../chunks/layer-utils.js";
+const _ = g`:host{position:relative;flex:1 1 auto}.list-item--hidden{display:none}.feature-observer{bottom:var(--calcite-spacing-xxl);position:relative;text-align:center;z-index:2}.loading-container{display:flex;justify-content:center;padding:var(--calcite-spacing-md) 0;width:100%}.notice-container{margin-bottom:var(--calcite-spacing-xs)}`, A = "nested";
+class F extends y {
   constructor() {
-    super(...arguments), this.displayCount = 3, this.flowType = "feature-utility-network-association-type";
+    super(...arguments), this.autoDestroyDisabled = !1, this.displayCount = 3, this.flowType = "feature-utility-network-association-type";
   }
   static {
-    this.properties = { description: 1, displayCount: 9, endIndex: 32, flowItems: 0, flowType: 1, heading: 1, map: 0, spatialReference: 0, timeZone: 1, view: 0 };
+    this.properties = { autoDestroyDisabled: 5, description: 1, displayCount: 9, endIndex: 32, flowItems: 0, flowType: 1, heading: 1, map: 0, referenceElement: 1, spatialReference: 0, timeZone: 1, view: 0 };
   }
   static {
-    this.styles = b;
+    this.styles = _;
   }
   get endIndex() {
     const { currentFeaturePage: e, featuresPerPage: t, maxFeatureCount: s } = this;
     return Math.min(e * t, s);
   }
+  async destroy() {
+    await this.manager.destroy();
+  }
   _featureViewModelMatch(e, t) {
     const s = e.graphic, i = s?.layer;
     let o = null;
-    i?.type === "subtype-sublayer" && i.parent ? o = i.parent.globalIdField ?? null : i && "globalIdField" in i && (o = i.globalIdField);
-    const l = o ? s?.attributes[o] : null, r = t.graphic, a = r?.layer;
+    m(i) && i.parent ? o = i.parent.globalIdField ?? null : i && "globalIdField" in i && (o = i.globalIdField);
+    const l = o ? s?.getAttribute(o) : null, r = t.graphic, a = r?.layer;
     let c = null;
-    a?.type === "subtype-sublayer" && a.parent ? c = a.parent.globalIdField ?? null : a && "globalIdField" in a && (c = a.globalIdField);
-    const h = c ? r?.attributes[c] : null;
-    return l && h && l === h;
+    m(a) && a.parent ? c = a.parent.globalIdField ?? null : a && "globalIdField" in a && (c = a.globalIdField);
+    const h = c ? r?.getAttribute(c) : null;
+    return !!(l && h && l === h);
   }
   _findFlowItem(e) {
     return this.flowItems?.findIndex((t) => {
@@ -49,7 +53,7 @@ class A extends g {
   async _handleFeatureClick(e, t, s) {
     const { flowItems: i } = this;
     if (e) {
-      i?.removeAll();
+      i?.destroyAll();
       return;
     }
     if (t < 0 || !i) {
@@ -75,7 +79,7 @@ class A extends g {
   }
   async _selectAssociation(e) {
     const { flowItems: t } = this;
-    t && t.push(p(d(this.parentFeatureViewModel, n`<arcgis-feature .flowItems=${t} .flowType=${"feature-utility-network-associations"} .graphic=${e.graphic} .map=${this.map} show-utility-network-content .spatialReference=${this.spatialReference} .timeZone=${this.timeZone} .view=${this.view}></arcgis-feature>`)));
+    t && t.push(p(d(this.parentFeatureViewModel, n`<arcgis-feature .autoDestroyDisabled=${this.autoDestroyDisabled} .flowItems=${t} .flowType=${"feature-association"} .graphic=${e.graphic} .map=${this.map} .referenceElement=${this.referenceElement} show-utility-network-content .spatialReference=${this.spatialReference} .timeZone=${this.timeZone} .view=${this.view}></arcgis-feature>`)));
   }
   _showAllAssociations(e) {
     const { flowItems: t, description: s } = this;
@@ -83,15 +87,15 @@ class A extends g {
       return;
     this.showAllEnabled = !0;
     const i = e?.title ?? "";
-    t.push(p(n`<arcgis-feature-utility-network-association-list .associationViewModels=${this.associationViewModels} .description=${s} .flowItems=${t} .flowType=${this.flowType} .heading=${i} .messages=${this.messages} .parentFeatureViewModel=${this.parentFeatureViewModel} .selectedLayer=${e} .showAllEnabled=${this.showAllEnabled}></arcgis-feature-utility-network-association-list>`));
+    t.push(p(n`<arcgis-feature-utility-network-association-list .autoDestroyDisabled=${this.autoDestroyDisabled} .associationViewModels=${this.associationViewModels} .description=${s} .flowItems=${t} .flowType=${this.flowType} .heading=${i} .messages=${this.messages} .parentFeatureViewModel=${this.parentFeatureViewModel} .referenceElement=${this.referenceElement} .selectedLayer=${e} .showAllEnabled=${this.showAllEnabled}></arcgis-feature-utility-network-association-list>`));
   }
   render() {
     const { associationViewModels: e, state: t } = this, s = this.selectedLayer?.title ?? this.messages?.noTitle ?? "";
-    return n`<div class="root">${t === "loading" || t === "querying" ? this._renderLoading() : n`<calcite-list .displayMode=${_} .filterEnabled=${this.showAllEnabled && !!this.selectedLayer} .filterLabel=${this.messages?.associationFilterPlaceholder} .filterPlaceholder=${this.messages?.associationFilterPlaceholder} .label=${s}>${this.showAllEnabled && this.selectedLayer ? n`${this._renderFeatureCountWarning()}${this._renderAssociatedFeatureListPage()}${this._renderFeatureObserver()}` : Array.from(e.keys(), (i) => this._renderTypeList(i))}</calcite-list>`}</div>`;
+    return n`<div class="root">${t === "loading" || t === "querying" ? this._renderLoading() : n`<calcite-list .displayMode=${A} .filterEnabled=${this.showAllEnabled && !!this.selectedLayer} .filterLabel=${this.messages?.associationFilterPlaceholder} .filterPlaceholder=${this.messages?.associationFilterPlaceholder} .label=${s}>${this.showAllEnabled && this.selectedLayer ? n`${this._renderFeatureCountWarning()}${this._renderAssociatedFeatureListPage()}${this._renderFeatureObserver()}` : Array.from(e.keys(), (i) => this._renderTypeList(i))}</calcite-list>`}</div>`;
   }
   _renderAssociatedFeature(e) {
     const { featureViewModel: t, title: s } = e, i = this.state === "loading", o = this._findFlowItem(t), l = o < 0 && this._isParentFeature(t), r = l || o >= 0, a = `associated-feature-${e.association.globalId}`;
-    return n`<calcite-list-item class=${y(i ? "list-item--hidden" : "")} .description=${u(e.terminalName ?? "")} .label=${u(s)} @calciteListItemSelect=${async () => await this._handleFeatureClick(l, o, t)}>${this._isConnectivityAssociation(e.association) ? this._renderConnectivityIcon(e.association.associationType, a) : null}${this._isConnectivityMidspanAssociation(e.association) ? n`<calcite-chip .label=${this._formatPercentAlong(e.association)} scale=s slot=content-end>${this._formatPercentAlong(e.association)}</calcite-chip>` : null}${this._renderChevronIconNode(r)}</calcite-list-item>`;
+    return n`<calcite-list-item class=${b(i ? "list-item--hidden" : "")} .description=${u(e.terminalName ?? "")} .label=${u(s)} @calciteListItemSelect=${async () => await this._handleFeatureClick(l, o, t)}>${this._isConnectivityAssociation(e.association) ? this._renderConnectivityIcon(e.association.associationType, a) : null}${this._isConnectivityMidspanAssociation(e.association) ? n`<calcite-chip .label=${this._formatPercentAlong(e.association)} scale=s slot=content-end>${this._formatPercentAlong(e.association)}</calcite-chip>` : null}${this._renderChevronIconNode(r)}</calcite-list-item>`;
   }
   _renderAssociatedFeatureList(e) {
     return e.toArray().map((t) => this._renderAssociatedFeature(t));
@@ -115,7 +119,7 @@ class A extends g {
     return e.toArray().map((t) => this._renderItemTooltip(t));
   }
 }
-m("arcgis-feature-utility-network-association-list", A);
+f("arcgis-feature-utility-network-association-list", F);
 export {
-  A as ArcgisFeatureUtilityNetworkAssociationList
+  F as ArcgisFeatureUtilityNetworkAssociationList
 };

package/dist/components/arcgis-feature-utility-network-association-list/index.js

@@ -1,3 +1,4 @@
+import "../arcgis-utility-network-association-list/index.js";
 import "../arcgis-feature/index.js";
 import ".//index.js";
 import "@esri/calcite-components/components/calcite-list";

package/dist/components/arcgis-feature-utility-network-associations/customElement.js

@@ -1,24 +1,24 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import { c as T } from "../../chunks/runtime.js";
-import { css as N, html as p } from "lit";
+import { c as S } from "../../chunks/runtime.js";
+import { css as M, html as p } from "lit";
 import { keyed as C } from "lit/directives/keyed.js";
-import { createReactiveMap as I, findUtilityNetwork as M, queryAllJSON as $, getOrCreateMapValue as j } from "@arcgis/core/applications/Components/featureUtils.js";
-import { stripHTML as k } from "@arcgis/core/applications/Components/stringUtils.js";
+import { i as k, q as $ } from "../../chunks/layer-utils.js";
+import { createReactiveMap as I, findUtilityNetwork as j, getOrCreateMapValue as D } from "@arcgis/core/applications/Components/featureUtils.js";
+import { stripHTML as v } from "@arcgis/core/applications/Components/stringUtils.js";
 import w from "@arcgis/core/core/Collection.js";
-import { ignoreAbortErrors as v } from "@arcgis/core/core/promiseUtils.js";
+import { ignoreAbortErrors as q } from "@arcgis/core/core/promiseUtils.js";
 import { watch as A } from "@arcgis/core/core/reactiveUtils.js";
-import * as V from "@arcgis/core/core/sql.js";
-import U from "@arcgis/core/rest/networks/support/NetworkElement.js";
+import * as U from "@arcgis/core/core/sql.js";
+import V from "@arcgis/core/rest/networks/support/NetworkElement.js";
 import x from "@arcgis/core/rest/networks/support/QueryAssociationsParameters.js";
-import D from "@arcgis/core/rest/support/FeatureSet.js";
 import P from "@arcgis/core/rest/support/Query.js";
-import G from "@arcgis/core/widgets/Feature/FeatureViewModel.js";
 import { LitElement as Q, renderElement as B } from "@arcgis/lumina";
-import { debounce as L } from "@arcgis/toolkit/function";
-const O = N`.list-container{min-height:var(--calcite-spacing-xxxl)}.loading-container{display:flex;justify-content:center;padding:var(--calcite-spacing-md) 0;width:100%}.sticky-loading-container{display:flex;position:sticky;bottom:var(--calcite-spacing-sm);align-items:center;justify-content:center;z-index:2;margin:0;padding:0;height:var(--calcite-spacing-xxxl);pointer-events:none;height:500px}`, q = 100, E = {
+import { debounce as E } from "@arcgis/toolkit/function";
+import G from "@arcgis/core/popup/Feature.js";
+const O = M`.list-container{min-height:var(--calcite-spacing-xxxl)}.loading-container{display:flex;justify-content:center;padding:var(--calcite-spacing-md) 0;width:100%}.sticky-loading-container{display:flex;position:sticky;bottom:var(--calcite-spacing-sm);align-items:center;justify-content:center;z-index:2;margin:0;padding:0;height:var(--calcite-spacing-xxxl);pointer-events:none;height:500px}`, L = 100, T = {
   assetGroup: "assetgroup",
   assetType: "assettype"
-}, S = "{00000000-0000-0000-0000-000000000000}";
+}, N = "{00000000-0000-0000-0000-000000000000}";
 class R extends Q {
   constructor() {
     super(...arguments), this._addFlowItem = (t) => {
@@ -38,17 +38,17 @@ class R extends Q {
     }, this._queryController = async (t) => {
       this._cancelQuery();
       const e = new AbortController();
-      this._queryAbortController = e, await v(this._query(t)), this._queryAbortController === e && (this._queryAbortController = null);
+      this._queryAbortController = e, await q(this._query(t)), this._queryAbortController === e && (this._queryAbortController = null);
     }, this._queryFeatureCountController = async () => {
       this._loaded = !1, this._cancelQueryFeatureCount();
       const t = new AbortController();
-      this._queryFeatureCountAbortController = t, await v(this._queryFeatureCount()), this._queryFeatureCountAbortController === t && (this._queryFeatureCountAbortController = null), this._loaded = !0;
-    }, this._queryDebounced = L(this._queryController, q), this._queryFeatureCountDebounced = L(this._queryFeatureCountController, q), this._structureAssociations = new w(), this._structureFeatureCount = 0, this._queryAssociationType = async () => {
+      this._queryFeatureCountAbortController = t, await q(this._queryFeatureCount()), this._queryFeatureCountAbortController === t && (this._queryFeatureCountAbortController = null), this._loaded = !0;
+    }, this._queryDebounced = E(this._queryController, L), this._queryFeatureCountDebounced = E(this._queryFeatureCountController, L), this._structureAssociations = new w(), this._structureFeatureCount = 0, this._queryAssociationType = async () => {
       this._activeAssociationType && this._queryDebounced(this._activeAssociationType);
     }, this._associationFeatures = I(), this._associationViewModels = I(), this._featureCount = 0, this._loaded = !1, this._queryAbortController = null, this._queryFeatureCountAbortController = null, this._queryPageAbortController = null, this.associationTypes = null, this.autoDestroyDisabled = !1, this.flowType = "feature-utility-network-associations", this.headingLevel = 2, this.source = "popup";
   }
   static {
-    this.properties = { _activeAssociationType: 16, _associationFeatures: 16, _associationViewModels: 16, _canLoad: 16, _canQuery: 16, _featureCount: 16, _loaded: 16, _queryAbortController: 16, _queryFeatureCountAbortController: 16, _queryPageAbortController: 16, _state: 16, associationTypes: 0, autoDestroyDisabled: 5, description: 1, flowItems: 0, flowType: 1, graphic: 0, heading: 1, headingLevel: 9, layer: 0, map: 0, messages: 0, parentFeatureViewModel: 0, source: 1, spatialReference: 0, timeZone: 1, view: 0 };
+    this.properties = { _activeAssociationType: 16, _associationFeatures: 16, _associationViewModels: 16, _canLoad: 16, _canQuery: 16, _featureCount: 16, _loaded: 16, _queryAbortController: 16, _queryFeatureCountAbortController: 16, _queryPageAbortController: 16, _state: 16, associationTypes: 0, autoDestroyDisabled: 5, description: 1, flowItems: 0, flowType: 1, graphic: 0, heading: 1, headingLevel: 9, layer: 0, map: 0, messages: 0, parentFeatureViewModel: 0, referenceElement: 1, source: 1, spatialReference: 0, timeZone: 1, view: 0 };
   }
   static {
     this.styles = O;
@@ -72,8 +72,8 @@ class R extends Q {
     const { layer: t, map: e } = this;
     if (!t?.loaded || !e)
       return null;
-    const s = this._isSubtypeSublayer(t) ? t.parent : t;
-    return M(e, s);
+    const s = k(t) ? t.parent : t;
+    return j(e, s);
   }
   get _canLoad() {
     return !!this.map;
@@ -82,8 +82,8 @@ class R extends Q {
     return !!this.layer?.capabilities?.query?.supportsPagination;
   }
   get _state() {
-    const { _canLoad: t, _canQuery: e, _featureCount: s, _loaded: o, _queryAbortController: i, _queryFeatureCountAbortController: a, _queryPageAbortController: u, associationTypes: c } = this;
-    return a || t && !o ? "loading" : i || u ? "querying" : !this._globalId || !c || !e || !s ? "disabled" : "ready";
+    const { _canLoad: t, _canQuery: e, _featureCount: s, _loaded: o, _queryAbortController: i, _queryFeatureCountAbortController: a, _queryPageAbortController: u, associationTypes: n } = this;
+    return a || t && !o ? "loading" : i || u ? "querying" : !this._globalId || !n || !e || !s ? "disabled" : "ready";
   }
   get heading() {
     return this._heading;
@@ -118,7 +118,7 @@ class R extends Q {
     });
   }
   _addAssociationTypeFlowItem(t) {
-    this._addFlowItem(B(p`<arcgis-feature-utility-network-association-list .associationViewModels=${this._associationViewModels} .description=${this.parentFeatureViewModel?.title} .flowItems=${this.flowItems} .flowType=${this.flowType} .heading=${this._getAssociationTypeTitle(t)} .messages=${this.messages} .map=${this.map} .parentFeatureViewModel=${this.parentFeatureViewModel} .state=${this._state} .spatialReference=${this.spatialReference} .timeZone=${this.timeZone} .view=${this.view}></arcgis-feature-utility-network-association-list>`));
+    this._addFlowItem(B(p`<arcgis-feature-utility-network-association-list .autoDestroyDisabled=${this.autoDestroyDisabled} .associationViewModels=${this._associationViewModels} .description=${this.parentFeatureViewModel?.heading} .flowItems=${this.flowItems} .flowType=${this.flowType} .heading=${this._getAssociationTypeTitle(t)} .messages=${this.messages} .map=${this.map} .parentFeatureViewModel=${this.parentFeatureViewModel} .referenceElement=${this.referenceElement} .state=${this._state} .spatialReference=${this.spatialReference} .timeZone=${this.timeZone} .view=${this.view}></arcgis-feature-utility-network-association-list>`));
   }
   _clearAssociations() {
     this._attachmentAssociations.removeAll(), this._connectivityAssociations.removeAll(), this._containerAssociations.removeAll(), this._contentAssociations.removeAll(), this._structureAssociations.removeAll();
@@ -146,57 +146,57 @@ class R extends Q {
       return 0;
     const a = await this._findLayersBySourceId(t);
     await this._loadLayers(a);
-    const u = a.map((r) => this._countAssociatedFeatureCount(r, e, s, o, i));
-    return (await Promise.all(u)).reduce((r, d) => r + d, 0);
+    const u = a.map((c) => this._countAssociatedFeatureCount(c, e, s, o, i));
+    return (await Promise.all(u)).reduce((c, d) => c + d, 0);
   }
   async _createAssociationFeatureObjects(t, e, s, o, i) {
     if (!t.length)
       return [];
-    const a = /* @__PURE__ */ new Map(), u = Array.from(e.entries()).map(async ([r, d]) => {
-      const l = await this._findLayersBySourceId(r);
+    const a = /* @__PURE__ */ new Map(), u = Array.from(e.entries()).map(async ([c, d]) => {
+      const l = await this._findLayersBySourceId(c);
       await this._loadLayers(l);
-      const y = l.map((n) => this._queryLayer(n, d, s, o, i));
-      (await Promise.all(y)).forEach((n) => {
-        n.forEach((h) => {
+      const y = l.map((r) => this._queryLayer(r, d, s, o, i));
+      (await Promise.all(y)).forEach((r) => {
+        r.forEach((h) => {
           if (this.source === "popup" ? h.sourceLayer && h.getEffectivePopupTemplate() : !!h.sourceLayer) {
-            const f = h.layer.globalIdField ?? "", g = h.attributes[f], b = a.get(g) ?? [];
+            const f = h.layer.globalIdField ?? "", g = h.getAttribute(f), b = a.get(g) ?? [];
             b.push(h), a.set(g, b);
           }
         });
       });
     });
     await Promise.all(u);
-    const c = [];
-    return await Promise.all(t.toArray().map(async (r) => {
-      const { fromNetworkElement: d, toNetworkElement: l } = r, y = d.globalId === this._globalId ? l : d, m = a.get(y.globalId) ?? [];
-      await Promise.all(m.map(async (n) => {
-        const h = this._utilityNetwork?.getTerminalById(y?.terminalId ?? void 0)?.name, _ = await n.sourceLayer.getFeatureTitle(n) || this._getFeatureTitle(n);
-        c.push({
+    const n = [];
+    return await Promise.all(t.toArray().map(async (c) => {
+      const { fromNetworkElement: d, toNetworkElement: l } = c, y = d.globalId === this._globalId ? l : d, m = a.get(y.globalId) ?? [];
+      await Promise.all(m.map(async (r) => {
+        const h = this._utilityNetwork?.getTerminalById(y?.terminalId ?? void 0)?.name, _ = await r.sourceLayer.getFeatureTitle(r) || this._getFeatureTitle(r);
+        n.push({
           title: _,
-          feature: n,
-          association: r,
+          feature: r,
+          association: c,
           terminalName: h
         });
       }));
-    })), c;
+    })), n;
   }
   _destroyAssociatedFeatureViewModels() {
     this._associationViewModels.forEach((t) => t.destroyAll());
   }
   _equals(t, e) {
-    if (t.globalId === S && e.globalId === S) {
+    if (t.globalId === N && e.globalId === N) {
       let s = function(d, l) {
         return d.networkSourceId === l.networkSourceId && d.globalId === l.globalId && d.terminalId === l.terminalId && d.firstUnit === l.firstUnit && d.numUnits === l.numUnits;
       };
-      const o = t.fromNetworkElement, i = t.toNetworkElement, a = e.fromNetworkElement, u = e.toNetworkElement, c = s(o, a), r = s(i, u);
-      return c && r && t.associationType === e.associationType;
+      const o = t.fromNetworkElement, i = t.toNetworkElement, a = e.fromNetworkElement, u = e.toNetworkElement, n = s(o, a), c = s(i, u);
+      return n && c && t.associationType === e.associationType;
     }
     return t.globalId != null && e.globalId != null && t.globalId === e.globalId;
   }
   async _findLayersBySourceId(t) {
     const { _utilityNetwork: e, map: s } = this;
     e?.loaded || await e?.load();
-    const o = e.getLayerIdBySourceId(t), i = s.allLayers.filter((c) => !!e?.isUtilityLayer(c) && c.layerId === o), a = s.allTables.filter((c) => !!e?.isUtilityLayer(c) && c.layerId === o);
+    const o = e.getLayerIdBySourceId(t), i = s.allLayers.filter((n) => !!e?.isUtilityLayer(n) && n.layerId === o), a = s.allTables.filter((n) => !!e?.isUtilityLayer(n) && n.layerId === o);
     return i.concat(a).toArray();
   }
   _getAssociationsByType(t) {
@@ -245,7 +245,7 @@ class R extends Q {
     }
   }
   _getFeatureQueryWhereClause(t, e, s, o) {
-    const i = t.globalIdField, a = t.fieldsIndex.get(E.assetGroup), u = t.fieldsIndex.get(E.assetType), c = s != null, r = o != null, d = i ? V.sqlIn(i, e) : null, l = c ? `(${a?.name} = ${s})` : null, y = c && r ? `(${u?.name} = ${o})` : null;
+    const i = t.globalIdField, a = t.fieldsIndex.get(T.assetGroup), u = t.fieldsIndex.get(T.assetType), n = s != null, c = o != null, d = i ? U.sqlIn(i, e) : null, l = n ? `(${a?.name} = ${s})` : null, y = n && c ? `(${u?.name} = ${o})` : null;
     return [d, l, y].filter(Boolean).join(" AND ");
   }
   _getFeatureTitle(t) {
@@ -255,12 +255,6 @@ class R extends Q {
     const o = "displayField" in s ? s.displayField : null, i = o != null ? e[o.toString()] : null, a = i != null ? i.toString() : null, u = t.getObjectId()?.toString();
     return a || u || "";
   }
-  _isSubtypeGroupLayer(t) {
-    return t != null && typeof t == "object" && "type" in t && t.type === "subtype-group" && "sublayers" in t;
-  }
-  _isSubtypeSublayer(t) {
-    return t?.type === "subtype-sublayer";
-  }
   async _loadUtiltyNetworks() {
     const t = this.map;
     if (!t)
@@ -285,12 +279,12 @@ class R extends Q {
     return this._equals(t.association, e.association);
   }
   async _queryAssociatedFeatures(t, e) {
-    const { layer: s, _globalId: o, associationTypes: i, _utilityNetwork: a, _canQuery: u, _associationFeatures: c } = this;
+    const { layer: s, _globalId: o, associationTypes: i, _utilityNetwork: a, _canQuery: u, _associationFeatures: n } = this;
     if (await Promise.allSettled([s?.load(), a?.load()]), !u || !s || !i || !a)
       return;
-    const r = this._getAssociationsByType(t.type), { associatedAssetGroup: d, associatedAssetType: l } = t, y = /* @__PURE__ */ new Map();
-    r.forEach((n) => {
-      const { fromNetworkElement: h, toNetworkElement: _ } = n, { networkSourceId: f, elementGlobalId: g } = h.globalId === o ? {
+    const c = this._getAssociationsByType(t.type), { associatedAssetGroup: d, associatedAssetType: l } = t, y = /* @__PURE__ */ new Map();
+    c.forEach((r) => {
+      const { fromNetworkElement: h, toNetworkElement: _ } = r, { networkSourceId: f, elementGlobalId: g } = h.globalId === o ? {
         networkSourceId: _.networkSourceId,
         elementGlobalId: _.globalId
       } : {
@@ -299,52 +293,52 @@ class R extends Q {
       }, b = y.get(f) || [];
       b.push(g), y.set(f, b);
     });
-    const m = await this._createAssociationFeatureObjects(r, y, d, l, e);
-    this._parseFeatureObjects(m, c);
+    const m = await this._createAssociationFeatureObjects(c, y, d, l, e);
+    this._parseFeatureObjects(m, n);
   }
   async _queryAssociations(t) {
     const { layer: e, _globalId: s, associationTypes: o, _utilityNetwork: i, _canQuery: a } = this;
     if (await Promise.allSettled([e?.load(), i?.load()]), this._clearAssociations(), !a || !e || !o || !i || !s)
       return;
-    const u = this._isSubtypeSublayer(e) ? e.parent : e, c = new U({
+    const u = k(e) ? e.parent : e, n = new V({
       globalId: s,
       networkSourceId: i.getSourceIdByLayerId(u.layerId)
-    }), r = /* @__PURE__ */ new Set();
-    o.forEach((n) => {
-      switch (n.type) {
+    }), c = /* @__PURE__ */ new Set();
+    o.forEach((r) => {
+      switch (r.type) {
         case "attachment":
         case "structure":
-          r.add("attachment");
+          c.add("attachment");
           break;
         case "container":
         case "content":
-          r.add("containment");
+          c.add("containment");
           break;
         case "connectivity":
-          r.add("connectivity"), r.add("junction-junction-connectivity"), r.add("junction-edge-from-connectivity"), r.add("junction-edge-midspan-connectivity"), r.add("junction-edge-to-connectivity");
+          c.add("connectivity"), c.add("junction-junction-connectivity"), c.add("junction-edge-from-connectivity"), c.add("junction-edge-midspan-connectivity"), c.add("junction-edge-to-connectivity");
           break;
       }
     });
     const d = await i?.queryAssociations(new x({
-      elements: [c],
-      types: Array.from(r)
+      elements: [n],
+      types: Array.from(c)
     }), {
       signal: t?.signal
     }), l = /* @__PURE__ */ new Map(), y = /* @__PURE__ */ new Map();
-    o.forEach((n) => {
-      y.set(n.type, n), l.set(n.type, []);
-    }), d.forEach((n) => {
-      const { toNetworkElement: h, fromNetworkElement: _ } = n;
-      switch (n.associationType) {
+    o.forEach((r) => {
+      y.set(r.type, r), l.set(r.type, []);
+    }), d.forEach((r) => {
+      const { toNetworkElement: h, fromNetworkElement: _ } = r;
+      switch (r.associationType) {
         case "attachment":
           if (_?.globalId === s) {
             if (this._shouldDiscardNetworkElement(h, "attachment", y))
               break;
-            l.get("attachment")?.push(h.globalId), this._attachmentAssociations.add(n);
+            l.get("attachment")?.push(h.globalId), this._attachmentAssociations.add(r);
           } else {
             if (this._shouldDiscardNetworkElement(_, "structure", y))
               break;
-            l.get("structure")?.push(_.globalId), this._structureAssociations.add(n);
+            l.get("structure")?.push(_.globalId), this._structureAssociations.add(r);
           }
           break;
         case "connectivity":
@@ -361,24 +355,24 @@ class R extends Q {
               break;
             l.get("connectivity")?.push(_.globalId);
           }
-          this._connectivityAssociations.add(n);
+          this._connectivityAssociations.add(r);
           break;
         case "containment":
           if (_?.globalId === s) {
             if (this._shouldDiscardNetworkElement(h, "content", y))
               break;
-            l.get("content")?.push(h.globalId), this._contentAssociations.add(n);
+            l.get("content")?.push(h.globalId), this._contentAssociations.add(r);
           } else {
             if (this._shouldDiscardNetworkElement(_, "container", y))
               break;
-            l.get("container")?.push(_.globalId), this._containerAssociations.add(n);
+            l.get("container")?.push(_.globalId), this._containerAssociations.add(r);
           }
           break;
       }
     });
-    const m = o.map(async (n) => {
-      const { associatedNetworkSourceId: h, associatedAssetGroup: _, associatedAssetType: f } = n, g = l.get(n.type), F = _ != null ? await this._countAssociatedFeatures(h, g, _, f, t) : g.length;
-      switch (n.type) {
+    const m = o.map(async (r) => {
+      const { associatedNetworkSourceId: h, associatedAssetGroup: _, associatedAssetType: f } = r, g = l.get(r.type), F = _ != null ? await this._countAssociatedFeatures(h, g, _, f, t) : g.length;
+      switch (r.type) {
         case "attachment":
           this._attachmentFeatureCount = F;
           break;
@@ -412,17 +406,14 @@ class R extends Q {
       where: a,
       outFields: ["*"],
       cacheHint: this._supportsCacheHint
-    }), c = D.fromJSON(await $(t, u, i));
-    return c.features.forEach((r) => {
-      const d = this._isSubtypeGroupLayer(t);
-      r.layer = d ? t.findSublayerForFeature(r) : t, r.sourceLayer = d ? t.findSublayerForFeature(r) : t;
-    }), c.features;
+    }), { features: n } = await $(t, u, i);
+    return n;
   }
   _parseFeatureObjects(t, e) {
     const s = I();
     t.forEach((o) => {
       const a = (o?.feature).sourceLayer;
-      j(s, a, () => new w()).add(o);
+      D(s, a, () => new w()).add(o);
     });
     for (const [o, i] of s)
       this._sortFeatureObjectsByTitle(i), e.set(o, i);
@@ -434,18 +425,18 @@ class R extends Q {
   _setUpUtilityNetworkAssociationsViewModels() {
     this._associationViewModels.forEach((i, a) => {
       const u = this._associationFeatures.get(a);
-      u ? i.forEach((c) => {
-        u.find((d) => this._matchesGlobalFeature(c, d)) || (i.remove(c), i.length || this._associationViewModels.delete(a));
+      u ? i.forEach((n) => {
+        u.find((d) => this._matchesGlobalFeature(n, d)) || (i.remove(n), i.length || this._associationViewModels.delete(a));
       }) : (i.removeAll(), this._associationViewModels.delete(a));
     });
     const { map: t, view: e, spatialReference: s, timeZone: o } = this;
     this._associationFeatures.forEach((i, a) => {
       const u = this._associationViewModels.get(a) || new w();
-      i?.filter(Boolean).forEach((c, r) => {
-        if (!u.some((l) => this._matchesGlobalFeature(l, c))) {
-          const { association: l, feature: y, terminalName: m, title: n } = c;
+      i?.filter(Boolean).forEach((n, c) => {
+        if (!u.some((l) => this._matchesGlobalFeature(l, n))) {
+          const { association: l, feature: y, terminalName: m, title: r } = n;
           u.add({
-            title: n,
+            title: r,
             association: l,
             featureViewModel: new G({
               abilities: { utilityNetworkAssociationsContent: !1 },
@@ -456,7 +447,7 @@ class R extends Q {
               graphic: y
             }),
             terminalName: m
-          }, r);
+          }, c);
         }
       }), this._associationViewModels.set(a, u);
     });
@@ -482,7 +473,7 @@ class R extends Q {
   }
   _renderAssociationTypeListItem(t) {
     const e = this._getAssociationTypeTitle(t);
-    return C(`association-type-${t.type}`, p`<calcite-list-item .description=${k(t.description)} .label=${k(e)} .value=${t.type} @calciteListItemSelect=${() => this._selectAssociationType(t)}><calcite-icon flip-rtl icon=chevron-right scale=s slot=content-end></calcite-icon></calcite-list-item>`);
+    return C(`association-type-${t.type}`, p`<calcite-list-item .description=${v(t.description)} .label=${v(e)} .value=${t.type} @calciteListItemSelect=${() => this._selectAssociationType(t)}><calcite-icon flip-rtl icon=chevron-right scale=s slot=content-end></calcite-icon></calcite-list-item>`);
   }
   _renderContent() {
     const { _state: t, associationTypes: e, messages: s } = this, o = s?.associationsList ?? s?.noTitle ?? "";
@@ -498,7 +489,7 @@ class R extends Q {
     return this._state === "querying" ? p`<div class="sticky-loading-container">${this._renderLoadingIcon()}</div>` : null;
   }
 }
-T("arcgis-feature-utility-network-associations", R);
+S("arcgis-feature-utility-network-associations", R);
 export {
   R as ArcgisFeatureUtilityNetworkAssociations
 };