diff --git a/src/components.d.ts b/src/components.d.ts index 9830ea786..e60999684 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -14,8 +14,6 @@ export { IReportingOptions as IReportingOptions1 } from "./components"; export { ILayerItemsHash } from "./components/layer-list/layer-list"; export { UserSession } from "@esri/solution-common"; export namespace Components { - interface ArcgisLogin { - } interface BasemapGallery { /** * IBasemapConfig: List of any basemaps to filter out from the basemap widget @@ -528,7 +526,7 @@ export namespace Components { */ "buttonType": ButtonType; /** - * calcite-modal: Use this prop when using the button within a parent like a dropdown that would constrain the modal and that is not desired + * calcite-dialog: Use this prop when using the button within a parent like a dropdown that would constrain the dialog and that is not desired */ "deleteDialog": any; /** @@ -2046,12 +2044,6 @@ export interface StoreManagerCustomEvent extends CustomEvent { target: HTMLStoreManagerElement; } declare global { - interface HTMLArcgisLoginElement extends Components.ArcgisLogin, HTMLStencilElement { - } - var HTMLArcgisLoginElement: { - prototype: HTMLArcgisLoginElement; - new (): HTMLArcgisLoginElement; - }; interface HTMLBasemapGalleryElement extends Components.BasemapGallery, HTMLStencilElement { } var HTMLBasemapGalleryElement: { @@ -2713,7 +2705,6 @@ declare global { new (): HTMLStoreManagerElement; }; interface HTMLElementTagNameMap { - "arcgis-login": HTMLArcgisLoginElement; "basemap-gallery": HTMLBasemapGalleryElement; "buffer-tools": HTMLBufferToolsElement; "card-manager": HTMLCardManagerElement; @@ -2764,8 +2755,6 @@ declare global { } } declare namespace LocalJSX { - interface ArcgisLogin { - } interface BasemapGallery { /** * IBasemapConfig: List of any basemaps to filter out from the basemap widget @@ -3335,7 +3324,7 @@ declare namespace LocalJSX { */ "buttonType"?: ButtonType; /** - * calcite-modal: Use this prop when using the button within a parent like a dropdown that would constrain the modal and that is not desired + * calcite-dialog: Use this prop when using the button within a parent like a dropdown that would constrain the dialog and that is not desired */ "deleteDialog"?: any; /** @@ -4704,7 +4693,6 @@ declare namespace LocalJSX { "value"?: string; } interface IntrinsicElements { - "arcgis-login": ArcgisLogin; "basemap-gallery": BasemapGallery; "buffer-tools": BufferTools; "card-manager": CardManager; @@ -4758,7 +4746,6 @@ export { LocalJSX as JSX }; declare module "@stencil/core" { export namespace JSX { interface IntrinsicElements { - "arcgis-login": LocalJSX.ArcgisLogin & JSXBase.HTMLAttributes; "basemap-gallery": LocalJSX.BasemapGallery & JSXBase.HTMLAttributes; "buffer-tools": LocalJSX.BufferTools & JSXBase.HTMLAttributes; "card-manager": LocalJSX.CardManager & JSXBase.HTMLAttributes; diff --git a/src/components/arcgis-login/arcgis-login.css b/src/components/arcgis-login/arcgis-login.css deleted file mode 100644 index 0705834fd..000000000 --- a/src/components/arcgis-login/arcgis-login.css +++ /dev/null @@ -1,19 +0,0 @@ -/** @license - * Copyright 2022 Esri - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -:host { - display: block; -} \ No newline at end of file diff --git a/src/components/arcgis-login/arcgis-login.tsx b/src/components/arcgis-login/arcgis-login.tsx deleted file mode 100644 index 2fd585698..000000000 --- a/src/components/arcgis-login/arcgis-login.tsx +++ /dev/null @@ -1,89 +0,0 @@ -/** @license - * Copyright 2022 Esri - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { Component, Element, Host, h } from '@stencil/core'; - -@Component({ - tag: 'arcgis-login', - styleUrl: 'arcgis-login.css', - shadow: true, -}) -export class ArcgisLogin { - //-------------------------------------------------------------------------- - // - // Host element access - // - //-------------------------------------------------------------------------- - - @Element() el: HTMLArcgisLoginElement; - - //-------------------------------------------------------------------------- - // - // Properties (public) - // - //-------------------------------------------------------------------------- - - //-------------------------------------------------------------------------- - // - // State (internal) - // - //-------------------------------------------------------------------------- - - //-------------------------------------------------------------------------- - // - // Properties (protected) - // - //-------------------------------------------------------------------------- - - //-------------------------------------------------------------------------- - // - // Watch handlers - // - //-------------------------------------------------------------------------- - - //-------------------------------------------------------------------------- - // - // Methods (public) - // - //-------------------------------------------------------------------------- - - //-------------------------------------------------------------------------- - // - // Events (public) - // - //-------------------------------------------------------------------------- - - //-------------------------------------------------------------------------- - // - // Functions (lifecycle) - // - //-------------------------------------------------------------------------- - - render() { - return ( - - - - ); - } - - //-------------------------------------------------------------------------- - // - // Functions (protected) - // - //-------------------------------------------------------------------------- - -} diff --git a/src/components/arcgis-login/readme.md b/src/components/arcgis-login/readme.md deleted file mode 100644 index 3d9e11110..000000000 --- a/src/components/arcgis-login/readme.md +++ /dev/null @@ -1,10 +0,0 @@ -# arcgis-login - - - - - - ----------------------------------------------- - -*Built with [StencilJS](https://stenciljs.com/)* diff --git a/src/components/arcgis-login/test/arcgis-login.e2e.ts b/src/components/arcgis-login/test/arcgis-login.e2e.ts deleted file mode 100644 index e41fc946c..000000000 --- a/src/components/arcgis-login/test/arcgis-login.e2e.ts +++ /dev/null @@ -1,27 +0,0 @@ -/** @license - * Copyright 2022 Esri - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { newE2EPage } from '@stencil/core/testing'; - -xdescribe('arcgis-login', () => { - it('renders', async () => { - const page = await newE2EPage(); - await page.setContent(''); - - const element = await page.find('arcgis-login'); - expect(element).toHaveClass('hydrated'); - }); -}); diff --git a/src/components/arcgis-login/test/arcgis-login.spec.tsx b/src/components/arcgis-login/test/arcgis-login.spec.tsx deleted file mode 100644 index a4f2dfcf2..000000000 --- a/src/components/arcgis-login/test/arcgis-login.spec.tsx +++ /dev/null @@ -1,34 +0,0 @@ -/** @license - * Copyright 2022 Esri - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { newSpecPage } from '@stencil/core/testing'; -import { ArcgisLogin } from '../arcgis-login'; - -xdescribe('arcgis-login', () => { - it('renders', async () => { - const page = await newSpecPage({ - components: [ArcgisLogin], - html: ``, - }); - expect(page.root).toEqualHtml(` - - - - - - `); - }); -}); diff --git a/src/components/card-manager/readme.md b/src/components/card-manager/readme.md index 15de89d02..51a94845d 100644 --- a/src/components/card-manager/readme.md +++ b/src/components/card-manager/readme.md @@ -75,17 +75,11 @@ graph TD; delete-button --> delete-dialog calcite-action --> calcite-loader calcite-action --> calcite-icon - delete-dialog --> calcite-modal + delete-dialog --> calcite-dialog delete-dialog --> calcite-button - calcite-modal --> calcite-scrim - calcite-modal --> calcite-icon + calcite-dialog --> calcite-scrim + calcite-dialog --> calcite-panel calcite-scrim --> calcite-loader - edit-card --> calcite-notice - edit-card --> calcite-loader - calcite-notice --> calcite-icon - calcite-alert --> calcite-icon - calcite-alert --> calcite-chip - calcite-chip --> calcite-icon calcite-panel --> calcite-action calcite-panel --> calcite-action-menu calcite-panel --> calcite-scrim @@ -93,6 +87,12 @@ graph TD; calcite-action-menu --> calcite-popover calcite-popover --> calcite-action calcite-popover --> calcite-icon + edit-card --> calcite-notice + edit-card --> calcite-loader + calcite-notice --> calcite-icon + calcite-alert --> calcite-icon + calcite-alert --> calcite-chip + calcite-chip --> calcite-icon calcite-flow-item --> calcite-action calcite-flow-item --> calcite-panel create-feature --> calcite-notice diff --git a/src/components/crowdsource-manager/crowdsource-manager.css b/src/components/crowdsource-manager/crowdsource-manager.css index 5fc0f3225..ac9856220 100644 --- a/src/components/crowdsource-manager/crowdsource-manager.css +++ b/src/components/crowdsource-manager/crowdsource-manager.css @@ -226,4 +226,8 @@ .z-index-1 { z-index: 1 !important; +} + +.filter-content-space { + --calcite-dialog-content-space: 0px; } \ No newline at end of file diff --git a/src/components/crowdsource-manager/crowdsource-manager.tsx b/src/components/crowdsource-manager/crowdsource-manager.tsx index bd6180947..b1fab06b0 100644 --- a/src/components/crowdsource-manager/crowdsource-manager.tsx +++ b/src/components/crowdsource-manager/crowdsource-manager.tsx @@ -1175,43 +1175,36 @@ export class CrowdsourceManager { */ protected _filterModal(): VNode { return ( - void this._closeFilter()} + modal={true} + onCalciteDialogClose={() => void this._closeFilter()} open={this._filterOpen} widthScale="s" > - -
- this._closeFilter()} - comboboxOverlayPositioning="fixed" - layerExpressions={this._layerExpressions} - onFilterListReset={() => { - this._handleFilterListReset(); - void this._mapCard.resetFilter(); - }} - onFilterUpdate={async () => { - const active = this._filterList.filterCount > 0; - await this._layerTable?.filterUpdate(active); - await this._mapCard.updateFilterState(active); - }} - ref={(el) => this._filterList = el} - view={this._mapView} - zoomBtn={false} - /> -
- + this._closeFilter()} + comboboxOverlayPositioning="fixed" + layerExpressions={this._layerExpressions} + onFilterListReset={() => { + this._handleFilterListReset(); + void this._mapCard.resetFilter(); + }} + onFilterUpdate={async () => { + const active = this._filterList.filterCount > 0; + await this._layerTable?.filterUpdate(active); + await this._mapCard.updateFilterState(active); + }} + ref={(el) => this._filterList = el} + view={this._mapView} + zoomBtn={false} + /> + ); } diff --git a/src/components/crowdsource-manager/readme.md b/src/components/crowdsource-manager/readme.md index 20eb62f6f..7fc1fab42 100644 --- a/src/components/crowdsource-manager/readme.md +++ b/src/components/crowdsource-manager/readme.md @@ -73,7 +73,7 @@ - calcite-action - calcite-tooltip - [delete-dialog](../delete-dialog) -- calcite-modal +- calcite-dialog - instant-apps-filter-list ### Graph @@ -91,7 +91,7 @@ graph TD; crowdsource-manager --> calcite-action crowdsource-manager --> calcite-tooltip crowdsource-manager --> delete-dialog - crowdsource-manager --> calcite-modal + crowdsource-manager --> calcite-dialog crowdsource-manager --> instant-apps-filter-list calcite-panel --> calcite-action calcite-panel --> calcite-action-menu @@ -109,10 +109,10 @@ graph TD; delete-button --> calcite-action delete-button --> calcite-tooltip delete-button --> delete-dialog - delete-dialog --> calcite-modal + delete-dialog --> calcite-dialog delete-dialog --> calcite-button - calcite-modal --> calcite-scrim - calcite-modal --> calcite-icon + calcite-dialog --> calcite-scrim + calcite-dialog --> calcite-panel map-card --> calcite-progress map-card --> map-tools map-card --> calcite-action-bar @@ -202,6 +202,7 @@ graph TD; calcite-flow-item --> calcite-panel create-feature --> calcite-notice create-feature --> calcite-loader + layer-table --> calcite-scrim layer-table --> calcite-shell layer-table --> calcite-panel layer-table --> calcite-input @@ -215,7 +216,7 @@ graph TD; layer-table --> calcite-button layer-table --> instant-apps-social-share layer-table --> calcite-tooltip - layer-table --> calcite-modal + layer-table --> calcite-dialog layer-table --> instant-apps-filter-list instant-apps-filter-list --> calcite-panel instant-apps-filter-list --> calcite-loader diff --git a/src/components/crowdsource-reporter/readme.md b/src/components/crowdsource-reporter/readme.md index a316690ce..ffc178ee9 100644 --- a/src/components/crowdsource-reporter/readme.md +++ b/src/components/crowdsource-reporter/readme.md @@ -219,10 +219,10 @@ graph TD; delete-button --> calcite-action delete-button --> calcite-tooltip delete-button --> delete-dialog - delete-dialog --> calcite-modal + delete-dialog --> calcite-dialog delete-dialog --> calcite-button - calcite-modal --> calcite-scrim - calcite-modal --> calcite-icon + calcite-dialog --> calcite-scrim + calcite-dialog --> calcite-panel edit-card --> calcite-notice edit-card --> calcite-loader create-related-feature --> calcite-notice diff --git a/src/components/delete-button/delete-button.tsx b/src/components/delete-button/delete-button.tsx index 09e4f48fa..320a773cc 100644 --- a/src/components/delete-button/delete-button.tsx +++ b/src/components/delete-button/delete-button.tsx @@ -39,7 +39,7 @@ export class DeleteButton { //-------------------------------------------------------------------------- /** - * calcite-modal: Use this prop when using the button within a parent like a dropdown that would constrain the modal and that is not desired + * calcite-dialog: Use this prop when using the button within a parent like a dropdown that would constrain the dialog and that is not desired */ @Prop() deleteDialog; @@ -190,7 +190,6 @@ export class DeleteButton { ) : ( this._delete()} diff --git a/src/components/delete-button/readme.md b/src/components/delete-button/readme.md index 0ad927560..bd9d278cd 100644 --- a/src/components/delete-button/readme.md +++ b/src/components/delete-button/readme.md @@ -7,15 +7,15 @@ ## Properties -| Property | Attribute | Description | Type | Default | -| -------------- | --------------- | ----------------------------------------------------------------------------------------------------------------------------------------- | ---------------------- | ----------- | -| `buttonType` | `button-type` | ButtonType (button \| action): Support usage as action or button | `"action" \| "button"` | `"button"` | -| `deleteDialog` | `delete-dialog` | calcite-modal: Use this prop when using the button within a parent like a dropdown that would constrain the modal and that is not desired | `any` | `undefined` | -| `disabled` | `disabled` | boolean: This overrides internal enable/disable logic that is based on checks if the layer supports delete | `boolean` | `false` | -| `icon` | `icon` | string: The icon to display in the component | `string` | `undefined` | -| `ids` | -- | number[]: The ids that would be deleted | `any[]` | `[]` | -| `layer` | -- | esri/views/layers/FeatureLayer: https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html | `FeatureLayer` | `undefined` | -| `locale` | `locale` | string: Locale to use for translation of stings in the UI | `string` | `undefined` | +| Property | Attribute | Description | Type | Default | +| -------------- | --------------- | ------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------- | ----------- | +| `buttonType` | `button-type` | ButtonType (button \| action): Support usage as action or button | `"action" \| "button"` | `"button"` | +| `deleteDialog` | `delete-dialog` | calcite-dialog: Use this prop when using the button within a parent like a dropdown that would constrain the dialog and that is not desired | `any` | `undefined` | +| `disabled` | `disabled` | boolean: This overrides internal enable/disable logic that is based on checks if the layer supports delete | `boolean` | `false` | +| `icon` | `icon` | string: The icon to display in the component | `string` | `undefined` | +| `ids` | -- | number[]: The ids that would be deleted | `any[]` | `[]` | +| `layer` | -- | esri/views/layers/FeatureLayer: https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html | `FeatureLayer` | `undefined` | +| `locale` | `locale` | string: Locale to use for translation of stings in the UI | `string` | `undefined` | ## Events @@ -50,11 +50,18 @@ graph TD; calcite-button --> calcite-icon calcite-action --> calcite-loader calcite-action --> calcite-icon - delete-dialog --> calcite-modal + delete-dialog --> calcite-dialog delete-dialog --> calcite-button - calcite-modal --> calcite-scrim - calcite-modal --> calcite-icon + calcite-dialog --> calcite-scrim + calcite-dialog --> calcite-panel calcite-scrim --> calcite-loader + calcite-panel --> calcite-action + calcite-panel --> calcite-action-menu + calcite-panel --> calcite-scrim + calcite-action-menu --> calcite-action + calcite-action-menu --> calcite-popover + calcite-popover --> calcite-action + calcite-popover --> calcite-icon crowdsource-manager --> delete-button info-card --> delete-button style delete-button fill:#f9f,stroke:#333,stroke-width:4px diff --git a/src/components/delete-dialog/delete-dialog.tsx b/src/components/delete-dialog/delete-dialog.tsx index a696c4d30..3a02d7148 100644 --- a/src/components/delete-dialog/delete-dialog.tsx +++ b/src/components/delete-dialog/delete-dialog.tsx @@ -144,29 +144,22 @@ export class DeleteDialog { return ( - this._close()} + modal={true} + onCalciteDialogClose={() => this._close()} open={this.open} widthScale="s" > - -
+
{confirmMessage}
this._close()} - slot="secondary" + slot="footer-end" width="full" > {this._translations?.cancel} @@ -175,10 +168,11 @@ export class DeleteDialog { kind="danger" loading={this._isDeleting} onClick={() => void this._deleteFeatures()} - slot="primary" width="full"> + slot="footer-end" + width="full"> {this._translations?.delete} - + ); } diff --git a/src/components/delete-dialog/readme.md b/src/components/delete-dialog/readme.md index cc6ea9e09..c95b64cdb 100644 --- a/src/components/delete-dialog/readme.md +++ b/src/components/delete-dialog/readme.md @@ -32,17 +32,26 @@ ### Depends on -- calcite-modal +- calcite-dialog - calcite-button ### Graph ```mermaid graph TD; - delete-dialog --> calcite-modal + delete-dialog --> calcite-dialog delete-dialog --> calcite-button - calcite-modal --> calcite-scrim - calcite-modal --> calcite-icon + calcite-dialog --> calcite-scrim + calcite-dialog --> calcite-panel calcite-scrim --> calcite-loader + calcite-panel --> calcite-action + calcite-panel --> calcite-action-menu + calcite-panel --> calcite-scrim + calcite-action --> calcite-loader + calcite-action --> calcite-icon + calcite-action-menu --> calcite-action + calcite-action-menu --> calcite-popover + calcite-popover --> calcite-action + calcite-popover --> calcite-icon calcite-button --> calcite-loader calcite-button --> calcite-icon crowdsource-manager --> delete-dialog diff --git a/src/components/edit-card/edit-card.tsx b/src/components/edit-card/edit-card.tsx index f7c556e69..60af131af 100644 --- a/src/components/edit-card/edit-card.tsx +++ b/src/components/edit-card/edit-card.tsx @@ -358,7 +358,6 @@ export class EditCard { } as __esri.LayerInfo }); this._editor = new this.Editor({ - allowedWorkflows: "update", view: this.mapView, layerInfos, visibleElements: { diff --git a/src/components/feature-details/readme.md b/src/components/feature-details/readme.md index 475e73fe2..f4707329b 100644 --- a/src/components/feature-details/readme.md +++ b/src/components/feature-details/readme.md @@ -122,10 +122,10 @@ graph TD; delete-button --> calcite-action delete-button --> calcite-tooltip delete-button --> delete-dialog - delete-dialog --> calcite-modal + delete-dialog --> calcite-dialog delete-dialog --> calcite-button - calcite-modal --> calcite-scrim - calcite-modal --> calcite-icon + calcite-dialog --> calcite-scrim + calcite-dialog --> calcite-panel edit-card --> calcite-notice edit-card --> calcite-loader calcite-notice --> calcite-icon diff --git a/src/components/info-card/info-card.tsx b/src/components/info-card/info-card.tsx index b08ac916f..9f757a619 100644 --- a/src/components/info-card/info-card.tsx +++ b/src/components/info-card/info-card.tsx @@ -412,7 +412,7 @@ export class InfoCard { {this._translations.edit} { - this.isMobile ? ( + this.isMobile && deleteEnabled ? ( {this._translations.delete} diff --git a/src/components/info-card/readme.md b/src/components/info-card/readme.md index c8ad73472..bccedbad9 100644 --- a/src/components/info-card/readme.md +++ b/src/components/info-card/readme.md @@ -138,17 +138,11 @@ graph TD; delete-button --> delete-dialog calcite-action --> calcite-loader calcite-action --> calcite-icon - delete-dialog --> calcite-modal + delete-dialog --> calcite-dialog delete-dialog --> calcite-button - calcite-modal --> calcite-scrim - calcite-modal --> calcite-icon + calcite-dialog --> calcite-scrim + calcite-dialog --> calcite-panel calcite-scrim --> calcite-loader - edit-card --> calcite-notice - edit-card --> calcite-loader - calcite-notice --> calcite-icon - calcite-alert --> calcite-icon - calcite-alert --> calcite-chip - calcite-chip --> calcite-icon calcite-panel --> calcite-action calcite-panel --> calcite-action-menu calcite-panel --> calcite-scrim @@ -156,6 +150,12 @@ graph TD; calcite-action-menu --> calcite-popover calcite-popover --> calcite-action calcite-popover --> calcite-icon + edit-card --> calcite-notice + edit-card --> calcite-loader + calcite-notice --> calcite-icon + calcite-alert --> calcite-icon + calcite-alert --> calcite-chip + calcite-chip --> calcite-icon card-manager --> info-card crowdsource-reporter --> info-card feature-details --> info-card diff --git a/src/components/layer-table/layer-table.tsx b/src/components/layer-table/layer-table.tsx index 617d863f3..2c8da17ac 100644 --- a/src/components/layer-table/layer-table.tsx +++ b/src/components/layer-table/layer-table.tsx @@ -236,6 +236,11 @@ export class LayerTable { */ @State() _size: number = 0; + /** + * boolean: When true a loading indicator will be shown in place of the layer table + */ + @State() _queryingData = false; + //-------------------------------------------------------------------------- // // Properties (protected) @@ -825,6 +830,7 @@ export class LayerTable { render() { const tableNodeClass = this._fetchingData ? "display-none" : ""; const loadingClass = this._fetchingData ? "" : "display-none"; + const scrimClass = this._queryingData ? "" : "display-none"; const total = this._size.toString(); const selected = this.selectedIds.length.toString(); const tableHeightClass = this.isMobile ? "height-full" : "height-full-adjusted"; @@ -832,46 +838,49 @@ export class LayerTable { this._validateActiveActions(); return ( - - {this._getTableControlRow("header")} -
- - {showSearch && -
- void this._searchTextChanged(evt)} - placeholder={this._searchPlaceHolder} - title={this._searchPlaceHolder} - type="search" /> -
} - - -
- -
- { - !this.isMobile ? ( -
- { - this._translations.recordsSelected - .replace("{{total}}", total) - .replace("{{selected}}", selected) - } -
- ) : undefined - } - - {this.createFilterModal && this._filterModal()} +
+ + + {this._getTableControlRow("header")} +
+ + {showSearch && +
+ void this._searchTextChanged(evt)} + placeholder={this._searchPlaceHolder} + title={this._searchPlaceHolder} + type="search" /> +
} + + +
+ +
+ { + !this.isMobile ? ( +
+ { + this._translations.recordsSelected + .replace("{{total}}", total) + .replace("{{selected}}", selected) + } +
+ ) : undefined + } + + {this.createFilterModal && this._filterModal()} +
); } @@ -1069,10 +1078,9 @@ export class LayerTable { slot?: string ): VNode { const id = "more-table-options"; - const toolbarClass = this._canShowFullTextSearch() ? "border-bottom" : ""; return (
this._toolbar = el} slot={slot} > @@ -1669,7 +1677,7 @@ export class LayerTable { protected _showDelete(): void { this.showDelete.emit({ ids: this._getIds() - }) + }); } /** @@ -1796,7 +1804,6 @@ export class LayerTable { {( { + if (!queryComplete) { + this._queryingData = true; + } + }, 500); const oids = await queryAllOidsWithQueryFeatures(0, this._layer, [], orderBy); + queryComplete = true; + this._queryingData = false; let isBetween = false; const _start = this._table.viewModel.getObjectIdIndex(this._previousCurrentId); @@ -2017,7 +2035,6 @@ export class LayerTable { // When this issue occurs we will wait for 1 second and attempt to finish the loading process setTimeout(() => { if (!this._loaded) { - console.log(`table.state: ${this._table.state}`) void this.finishLoading(); } }, 1000); @@ -2036,7 +2053,7 @@ export class LayerTable { try { this._loaded = true; this._table.highlightIds.removeAll(); - this._table.clearSelectionFilter(); + (this._table as any).objectIds.removeAll(); this._resetColumnTemplates(); this._showOnlySelected = false; await this._handleDefaults(); @@ -2252,37 +2269,31 @@ export class LayerTable { * @protected */ protected _filterModal(): VNode { + alert("_filterModal how does this one get hit??") return ( - void this._closeFilter()} + modal={true} + onCalciteDialogClose={() => void this._closeFilter()} open={this._filterOpen} widthScale="s" > - -
- this._closeFilter()} - comboboxOverlayPositioning="fixed" - layerExpressions={this._layerExpressions} - onFilterListReset={() => void this._handleFilterListReset()} - onFilterUpdate={() => void this._handleFilterUpdate(this._filterList.filterCount > 0)} - ref={(el) => this._filterList = el} - view={this.mapView} - zoomBtn={false} - /> -
- + this._closeFilter()} + comboboxOverlayPositioning="fixed" + layerExpressions={this._layerExpressions} + onFilterListReset={() => void this._handleFilterListReset()} + onFilterUpdate={() => void this._handleFilterUpdate(this._filterList.filterCount > 0)} + ref={(el) => this._filterList = el} + view={this.mapView} + zoomBtn={false} + /> + ); } @@ -2383,7 +2394,7 @@ export class LayerTable { if (this._showOnlySelected) { this._table.filterBySelection(); } else { - this._table.clearSelectionFilter(); + (this._table as any).objectIds.removeAll(); } } diff --git a/src/components/layer-table/readme.md b/src/components/layer-table/readme.md index 03fafa051..8fc15f5fd 100644 --- a/src/components/layer-table/readme.md +++ b/src/components/layer-table/readme.md @@ -99,6 +99,7 @@ Type: `Promise` ### Depends on +- calcite-scrim - calcite-shell - calcite-panel - calcite-input @@ -112,12 +113,13 @@ Type: `Promise` - calcite-button - instant-apps-social-share - calcite-tooltip -- calcite-modal +- calcite-dialog - instant-apps-filter-list ### Graph ```mermaid graph TD; + layer-table --> calcite-scrim layer-table --> calcite-shell layer-table --> calcite-panel layer-table --> calcite-input @@ -131,8 +133,9 @@ graph TD; layer-table --> calcite-button layer-table --> instant-apps-social-share layer-table --> calcite-tooltip - layer-table --> calcite-modal + layer-table --> calcite-dialog layer-table --> instant-apps-filter-list + calcite-scrim --> calcite-loader calcite-panel --> calcite-action calcite-panel --> calcite-action-menu calcite-panel --> calcite-scrim @@ -142,7 +145,6 @@ graph TD; calcite-action-menu --> calcite-popover calcite-popover --> calcite-action calcite-popover --> calcite-icon - calcite-scrim --> calcite-loader calcite-input --> calcite-progress calcite-input --> calcite-icon calcite-action-bar --> calcite-action-group @@ -175,8 +177,8 @@ graph TD; instant-apps-social-share --> calcite-button instant-apps-social-share --> calcite-icon instant-apps-social-share --> calcite-action - calcite-modal --> calcite-scrim - calcite-modal --> calcite-icon + calcite-dialog --> calcite-scrim + calcite-dialog --> calcite-panel instant-apps-filter-list --> calcite-panel instant-apps-filter-list --> calcite-loader instant-apps-filter-list --> calcite-checkbox diff --git a/src/components/map-tools/map-tools.tsx b/src/components/map-tools/map-tools.tsx index 421696b2c..e9c3fa6da 100644 --- a/src/components/map-tools/map-tools.tsx +++ b/src/components/map-tools/map-tools.tsx @@ -541,7 +541,6 @@ export class MapTools { { this._setPageType(pageType) }} diff --git a/t9nmanifest.txt b/t9nmanifest.txt index 9905dee0f..92636cf33 100644 --- a/t9nmanifest.txt +++ b/t9nmanifest.txt @@ -1,5 +1,4 @@ src\assets\t9n\add-record-modal -src\assets\t9n\arcgis-login src\assets\t9n\buffer-tools src\assets\t9n\card-manager src\assets\t9n\comment-card