Merge pull request #632 from noi-techpark/development

development
noi-techpark · Oct 17, 2024 · fb9a956 · fb9a956
2 parents 969ab5c + ccf4dcd
commit fb9a956
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 23 deletions.
diff --git 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',
@@ -75,13 +75,19 @@ export const echargingdataCategory = (
           objectMapping: {
             text: 'AdditionalProperties.EchargingDataProperties.AccessTypeInfo',
           },
+          params: {
+            readonly: 'true',
+          },
         },
         {
           title: 'Payment information',
           component: CellComponent.StringCell,
           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
@@ -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 {

diff --git 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
@@ -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
@@ -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<SelectValue>('');

diff --git 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