-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7 from conterra/dev_exclusive
Dev exclusive
- Loading branch information
Showing
21 changed files
with
253 additions
and
186 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,3 +14,4 @@ | |
| /.vscode/settings.json | ||
| /.externalToolBuilders/ | ||
| /package-lock.json | ||
| /gulpfile.overrides.js | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| # add path patterns to ignore style files | ||
| **/external-libs/** | ||
| **/styles/dijit/** | ||
| **/styles/dijit/** |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| ✅ Tested for map.apps 4.15.1 / Linie 4 | ||
| ✅ Tested for map.apps 4.16.0 / Linie 4 | ||
|
|
||
| #### Release Notes | ||
| - autogenerated SNAPSHOT-Release |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,56 @@ | ||
| /* | ||
| * Copyright (C) 2023 con terra GmbH ([email protected]) | ||
| * | ||
| * 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. | ||
| */ | ||
| /// | ||
| /// Copyright (C) 2023 con terra GmbH ([email protected]) | ||
| /// | ||
| /// 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 { InjectedReference } from "apprt-core/InjectedReference"; | ||
| import type { ActionDefinition } from "toc/api"; | ||
| import type { AGSStoreFactory } from "agssearch/api"; | ||
| import { Messages } from "./nls/bundle"; | ||
| import { ResultViewerService } from "result-api/api"; | ||
| import { TocItem } from "toc/model/TocItem"; | ||
|
|
||
| const ID = "datatable"; | ||
|
|
||
| export default class DatatableActionDefinitionFactory { | ||
| constructor(props) { | ||
| private _i18n: Messages; | ||
| private _agsStoreFactory: InjectedReference<AGSStoreFactory>; | ||
| private dataModel: InjectedReference<any>; | ||
| private resultViewerService: InjectedReference<ResultViewerService>; | ||
|
|
||
| private supportedIds: Array<string>; | ||
|
|
||
| constructor(props: Record<string, any>) { | ||
| this.supportedIds = [ID]; | ||
| } | ||
|
|
||
| createDefinitionById(id) { | ||
| public createDefinitionById(id: string): ActionDefinition { | ||
| if (ID !== id) { | ||
| return; | ||
| } | ||
| const i18n = this._i18n.get(); | ||
| const agsStoreFactory = this._agsStoreFactory; | ||
| const dataModel = this._dataModel; | ||
| const resultViewerService = this._resultViewerService; | ||
| // eslint-disable-next-line @typescript-eslint/no-this-alias | ||
| const that = this; | ||
|
|
||
| return { | ||
| id: ID, | ||
| type: "button", | ||
| label: i18n.actionLabel, | ||
| icon: "icon-editor-table", | ||
|
|
||
| isVisibleForItem(tocItem) { | ||
| isVisibleForItem(tocItem: TocItem): boolean { | ||
| const ref = tocItem.ref; | ||
| const parent = ref && ref.parent; | ||
| const capabilities = parent && parent.capabilities; | ||
|
|
@@ -44,29 +59,34 @@ export default class DatatableActionDefinitionFactory { | |
| return true; | ||
| } else if (capabilities?.operations?.supportsQuery) { | ||
| return true; | ||
| } else { | ||
| } else if (parent.visibilityMode === "exclusive") { | ||
| return ref.sublayers && tocItem.listMode === "hide-children"; | ||
| } | ||
| else { | ||
| return false; | ||
| } | ||
| } else { | ||
| return false; | ||
| } | ||
| }, | ||
|
|
||
| trigger(tocItem) { | ||
| trigger(tocItem: TocItem): void { | ||
| const ref = tocItem.ref; | ||
| let id = ref.id; | ||
| if (ref?.layer?.type === "map-image") { | ||
| id = ref.layer.id + "/" + ref.id; | ||
| if (ref?.type === "map-image") { | ||
| id = `${id}/${ref.sublayers.items[0].id}`; | ||
| } else if (ref?.layer?.type === "map-image") { | ||
| id = `${ref.layer.id}/${id}`; | ||
| } | ||
| const storeProps = { | ||
| id: "action_store_" + new Date().getTime(), | ||
| id: `action_store_${new Date().getTime()}`, | ||
| layerId: id | ||
| }; | ||
|
|
||
| agsStoreFactory.createStore(storeProps).then((store) => { | ||
| store.load().then(async () => { | ||
| // result-ui is used | ||
| if (resultViewerService) { | ||
| if (that.resultViewerService) { | ||
| const idsProvider = async ({ limit }) => { | ||
| const result = await store.query({}, { | ||
| count: limit | ||
|
|
@@ -76,19 +96,19 @@ export default class DatatableActionDefinitionFactory { | |
| }; | ||
| }; | ||
|
|
||
| const dataTableFactory = resultViewerService.dataTableFactory; | ||
| const dataTableFactory = that.resultViewerService.dataTableFactory; | ||
| const dataTable = await dataTableFactory.createDataTableFromStoreAndQuery({ | ||
| dataTableTitle: store.title || store.id || i18n.searchResultTitle, | ||
| dataSource: store, | ||
| idsProvider | ||
| }); | ||
|
|
||
| const dataTableCollection = dataTableFactory.createDataTableCollection([dataTable]); | ||
| resultViewerService.open(dataTableCollection); | ||
| that.resultViewerService.open(dataTableCollection); | ||
| } | ||
| // resulcenter is used | ||
| else if (dataModel) { | ||
| dataModel.setDatasource(store); | ||
| else if (that.dataModel) { | ||
| that.dataModel.setDatasource(store); | ||
| } | ||
| // neither resultcenter nor result-ui is available | ||
| else { | ||
|
|
@@ -99,4 +119,12 @@ export default class DatatableActionDefinitionFactory { | |
| } | ||
| }; | ||
| } | ||
|
|
||
| setDataModel(dataModel: any): void { | ||
| this.dataModel = dataModel; | ||
| } | ||
|
|
||
| setResultViewerService(resultViewerService: any): void { | ||
| this.resultViewerService = resultViewerService; | ||
| } | ||
| } | ||
Oops, something went wrong.