feat(keywords): Change keywords on dataset page

to categories (first level thesaurus), change keywords on search card to second level thesaurus keywords
camptocamp · May 22, 2024 · 8d20dbc · 8d20dbc
1 parent 9d471b9
commit 8d20dbc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/apps/datahub-e2e/src/e2e/search.cy.ts b/apps/datahub-e2e/src/e2e/search.cy.ts
@@ -29,6 +29,12 @@ describe('search', () => {
         .find('.mel-badge-button-primary')
         .should('not.contain', 'HAUTS-DE-FRANCE')
     })
+    it('should not dislay any place keywords (which are already displayed as categories)', () => {
+      cy.get('mel-datahub-results-card-search')
+        .eq(6)
+        .find('.mel-badge-button-primary')
+        .should('not.contain', 'Administration, action publique')
+    })
     it('should not dislay html in abstract', () => {
       cy.get('mel-datahub-results-card-search')
         .eq(5)

diff --git a/apps/datahub/src/app/dataset/dataset-information/dataset-information.component.html b/apps/datahub/src/app/dataset/dataset-information/dataset-information.component.html
@@ -13,11 +13,11 @@
       <span class="font-semibold" translate="">mel.dataset.updatedOn</span>
       <div class="text-primary font-semibold">{{ lastUpdate }}</div>
     </div>
-    } @if(record.topics?.length) {
+    } @if(displayCategories?.length) {
     <div class="flex flex-col gap-2">
       <span class="font-semibold" translate="">mel.dataset.categories</span>
       <div class="flex gap-1 gap-x-2 flex-row flex-wrap">
-        @for(topic of record.topics; track $index) {
+        @for(topic of displayCategories; track $index) {
         <span class="mel-badge-primary truncate">
           {{ topic }}
         </span>

diff --git a/apps/datahub/src/app/dataset/dataset-information/dataset-information.component.ts b/apps/datahub/src/app/dataset/dataset-information/dataset-information.component.ts
@@ -23,4 +23,12 @@ export class DatasetInformationComponent {
   get territories() {
     return this.record?.keywords?.filter((keyword) => keyword.type === 'place')
   }
+
+  get displayCategories() {
+    const categoryKeywords = this.record?.keywords?.filter(
+      (keyword) => keyword.thesaurus?.name === 'Catégories'
+    )
+
+    return categoryKeywords?.map((keyword) => keyword.label)
+  }
 }
diff --git a/libs/mel/src/lib/results-list-item/results-list-item.component.ts b/libs/mel/src/lib/results-list-item/results-list-item.component.ts
@@ -22,7 +22,10 @@ export class ResultsListItemComponent {
   }
 
   get keywords() {
-    return this.record?.keywords?.filter((keyword) => keyword.type !== 'place')
+    return this.record?.keywords?.filter(
+      (keyword) =>
+        keyword.type !== 'place' && keyword.thesaurus?.name !== 'Catégories'
+    )
   }
 
   onKeywordClick(keyword: Keyword, event: Event) {