some fixes

noi-techpark · Oct 11, 2024 · ca8a849 · ca8a849
1 parent 947252d
commit ca8a849
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 9 deletions.
diff --git a/databrowser/src/config/tourism/article/article.sharedView.ts b/databrowser/src/config/tourism/article/article.sharedView.ts
@@ -12,14 +12,12 @@ import {
  dataStatesSubCategory,
  idReadOnlyCell,
  imageGalleryCategory,
- odhTagCategory,
  seasonCategory,
  shortnameCell,
  sourceSubCategoryWithDistinct,
  textInfoCategory,
  licenseInfoCategory,
  mappingCategory,
- tagCategory,
 } from '../../builder/tourism';
 import { videoItemsCategory } from '../../builder/tourism/video';
 import { DEFAULT_DATE_FORMAT, withOdhBaseUrl } from '../../utils';
@@ -83,8 +81,43 @@ export const articleSharedView = (): DetailViewConfig | EditViewConfig => ({
  },
  ],
  },
- odhTagCategory('article'),
- tagCategory('article'),
+ {
+ name: 'Tags',
+ slug: 'Tags',
+ subcategories: [
+ {
+ 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}',
+ },
+ },
+ {
+ title: 'Assigned Tags',
+ component: CellComponent.TagReferenceCell,
+ arrayMapping: {
+ targetPropertyName: 'items',
+ pathToParent: 'TagIds',
+ },
+ params: {
+ url: withOdhBaseUrl('/v1/Tag?validforentity=article'),
+ keySelector: 'Id',
+ labelSelector: 'TagName.{language}',
+ },
+ },
+ ],
+ },
+ ],
+ },
  {
  name: 'Article Details',
  slug: 'article-details',

diff --git a/databrowser/src/config/tourism/tag/tag.sharedView.ts b/databrowser/src/config/tourism/tag/tag.sharedView.ts
@@ -56,7 +56,7 @@ export const tagSharedView = (): DetailViewConfig | EditViewConfig => ({
  },
  params: {
  url: withOdhBaseUrl(
- '/v1/Distinct?odhtype=odhtag&fields=Types.[*]&rawsort=Types.[*]&getasarray=true'
+ '/v1/Distinct?odhtype=tag&fields=Types.[*]&rawsort=Types.[*]&getasarray=true'
  ),
  },
  },
@@ -71,7 +71,7 @@ export const tagSharedView = (): DetailViewConfig | EditViewConfig => ({
  showAddNewValue: 'true',
  showValueAsLabelFallback: 'true',
  url: withOdhBaseUrl(
- '/v1/Distinct?odhtype=odhtag&fields=MainEntity&rawsort=MainEntity&getasarray=true'
+ '/v1/Distinct?odhtype=tag&fields=MainEntity&rawsort=MainEntity&getasarray=true'
  ),
  },
  },
@@ -84,7 +84,7 @@ export const tagSharedView = (): DetailViewConfig | EditViewConfig => ({
  },
  params: {
  url: withOdhBaseUrl(
- '/v1/Distinct?odhtype=odhtag&fields=ValidForEntity.[*]&rawsort=ValidForEntity.[*]&getasarray=true'
+ '/v1/Distinct?odhtype=tag&fields=ValidForEntity.[*]&rawsort=ValidForEntity.[*]&getasarray=true'
  ),
  },
  },
@@ -119,7 +119,7 @@ export const tagSharedView = (): DetailViewConfig | EditViewConfig => ({
  },
  params: {
  url: withOdhBaseUrl(
- '/v1/Distinct?odhtype=odhtag&fields=ODHTagIds.[*]&rawsort=ODHTagIds.[*]&getasarray=true'
+ '/v1/Distinct?odhtype=tag&fields=ODHTagIds.[*]&rawsort=ODHTagIds.[*]&getasarray=true'
  ),
  },
  },
@@ -132,7 +132,7 @@ export const tagSharedView = (): DetailViewConfig | EditViewConfig => ({
  },
  params: {
  url: withOdhBaseUrl(
- '/v1/Distinct?odhtype=odhtag&fields=MappedTagIds.[*]&rawsort=MappedTagIds.[*]&getasarray=true'
+ '/v1/Distinct?odhtype=tag&fields=MappedTagIds.[*]&rawsort=MappedTagIds.[*]&getasarray=true'
  ),
  },
  },