From ccfd6f3e9b9bee704d7999a6906d0d8ce7997003 Mon Sep 17 00:00:00 2001 From: RudiThoeni Date: Thu, 17 Oct 2024 16:45:27 +0200 Subject: [PATCH 1/2] optimizations articles, echarging visualizations --- .../config/builder/tourism/echargingdata.ts | 2 +- .../tourism/article/article.listView.ts | 11 -------- .../tourism/article/article.sharedView.ts | 28 +++++++++++++------ .../datasets/ui/header/DatasetHeader.vue | 4 ++- databrowser/src/domain/datasets/utils.ts | 8 ++++++ 5 files changed, 31 insertions(+), 22 deletions(-) diff --git a/databrowser/src/config/builder/tourism/echargingdata.ts b/databrowser/src/config/builder/tourism/echargingdata.ts index db3c3541..fa927f48 100644 --- a/databrowser/src/config/builder/tourism/echargingdata.ts +++ b/databrowser/src/config/builder/tourism/echargingdata.ts @@ -14,7 +14,7 @@ export const echargingdataCategory = ( visible: options.visible, subcategories: [ { - name: 'Primary Data (synced from mobility api)', + name: 'Primary Data (synced from timeseries api)', properties: [ { title: 'State', diff --git a/databrowser/src/config/tourism/article/article.listView.ts b/databrowser/src/config/tourism/article/article.listView.ts index 8b21bc47..de4f1965 100644 --- a/databrowser/src/config/tourism/article/article.listView.ts +++ b/databrowser/src/config/tourism/article/article.listView.ts @@ -34,17 +34,6 @@ export const articleListView: ListViewConfig = { text: 'SubType', }, }, - { - title: 'Tags', - component: CellComponent.ArrayCell, - class: 'w-40', - objectMapping: { - items: 'SmgTags', - }, - params: { - separator: ', ', - }, - }, languageTableCell(), lastChangesTableCell(), sourceTableCell(), diff --git a/databrowser/src/config/tourism/article/article.sharedView.ts b/databrowser/src/config/tourism/article/article.sharedView.ts index bf0b2316..5cfdcd0f 100644 --- a/databrowser/src/config/tourism/article/article.sharedView.ts +++ b/databrowser/src/config/tourism/article/article.sharedView.ts @@ -88,18 +88,28 @@ export const articleSharedView = (): DetailViewConfig | EditViewConfig => ({ { name: '', properties: [ + // { + // title: 'Assigned ODH Tags (Deprecated)', + // component: CellComponent.TagReferenceCell, + // arrayMapping: { + // targetPropertyName: 'items', + // pathToParent: 'SmgTags', + // }, + // params: { + // url: withOdhBaseUrl('/v1/ODHTag?mainentity=article'), + // keySelector: 'Id', + // labelSelector: 'TagName.{language}', + // editable: 'false', + // }, + // }, { - title: 'Assigned ODH Tags (Deprecated)', - component: CellComponent.TagReferenceCell, - arrayMapping: { - targetPropertyName: 'items', - pathToParent: 'SmgTags', + title: 'Tags (Deprecated)', + component: CellComponent.ArrayCell, + objectMapping: { + items: 'SmgTags', }, params: { - url: withOdhBaseUrl('/v1/ODHTag?mainentity=article'), - keySelector: 'Id', - labelSelector: 'TagName.{language}', - editable: 'false', + separator: ', ', }, }, { diff --git a/databrowser/src/domain/datasets/ui/header/DatasetHeader.vue b/databrowser/src/domain/datasets/ui/header/DatasetHeader.vue index 41ceee54..e8eba623 100644 --- a/databrowser/src/domain/datasets/ui/header/DatasetHeader.vue +++ b/databrowser/src/domain/datasets/ui/header/DatasetHeader.vue @@ -125,6 +125,7 @@ import { useDatasetViewStore } from '../../view/store/datasetViewStore'; import { useSessionStorage } from '@vueuse/core'; import { computeRouteDomain } from '../../location/routeDomain'; import { computeRoutePath } from '../../location/routePath'; +import { getApiDomain } from '../../../../domain/datasets/utils'; const { view, isTableView } = storeToRefs(useDatasetViewStore()); @@ -226,7 +227,8 @@ const handleDatasetChange = (value: string) => { const getDomainOfDataset = (dataset: TourismMetaData) => { // TODO: fix this as referenced in OverviewLinkTable - return dataset.baseUrl.includes('tourism') ? 'tourism' : 'mobility'; + //return dataset.baseUrl.includes('tourism') ? 'tourism' : 'mobility'; + return getApiDomain(dataset) ?? 'mobility'; }; const currentDataset = ref(''); diff --git a/databrowser/src/domain/datasets/utils.ts b/databrowser/src/domain/datasets/utils.ts index dcc46413..6e04d53a 100644 --- a/databrowser/src/domain/datasets/utils.ts +++ b/databrowser/src/domain/datasets/utils.ts @@ -43,6 +43,14 @@ export const getTableLocationFromDataset = (dataset: TourismMetaData) => { return computeTableLocation(domain, pathSegments, apiFilter); }; +export const getApiDomain = (dataset: TourismMetaData) => { + if (dataset == null || dataset.baseUrl == null) { + return; + } + + return translateApiTypeToDomain(dataset); +}; + const translateApiTypeToDomain = (dataset: TourismMetaData) => { if (dataset.apiType) { // Add here all apiTypes From c8c99c73e926a7d0950085339c7e2a22a33ffc38 Mon Sep 17 00:00:00 2001 From: RudiThoeni Date: Thu, 17 Oct 2024 18:21:47 +0200 Subject: [PATCH 2/2] fixes --- databrowser/src/config/builder/tourism/echargingdata.ts | 6 ++++++ databrowser/src/config/builder/tourism/odh.ts | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/databrowser/src/config/builder/tourism/echargingdata.ts b/databrowser/src/config/builder/tourism/echargingdata.ts index fa927f48..208c5458 100644 --- a/databrowser/src/config/builder/tourism/echargingdata.ts +++ b/databrowser/src/config/builder/tourism/echargingdata.ts @@ -75,6 +75,9 @@ export const echargingdataCategory = ( objectMapping: { text: 'AdditionalProperties.EchargingDataProperties.AccessTypeInfo', }, + params: { + readonly: 'true', + }, }, { title: 'Payment information', @@ -82,6 +85,9 @@ export const echargingdataCategory = ( objectMapping: { text: 'AdditionalProperties.EchargingDataProperties.PaymentInfo', }, + params: { + readonly: 'true', + }, }, { title: 'Charging plugs types', diff --git a/databrowser/src/config/builder/tourism/odh.ts b/databrowser/src/config/builder/tourism/odh.ts index bd4e93ca..b297f58e 100644 --- a/databrowser/src/config/builder/tourism/odh.ts +++ b/databrowser/src/config/builder/tourism/odh.ts @@ -18,7 +18,7 @@ export const odhActiveTableCell = (): PropertyConfig => ({ }); export const odhTagCell = (mainentity?: string): PropertyConfig => { - const filterParam = mainentity == null ? '' : `?mainentity=${mainentity}`; + const filterParam = mainentity == null ? '' : `?validforentity=${mainentity}`; const url = withOdhBaseUrl('/v1/ODHTag') + filterParam; return {