fix: change all occurences of publisher to organization and fix ut

geonetwork · Jul 5, 2024 · 032a2c4 · 032a2c4
1 parent 7296aed
commit 032a2c4
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/apps/datahub-e2e/src/e2e/datasets.cy.ts b/apps/datahub-e2e/src/e2e/datasets.cy.ts
@@ -192,13 +192,13 @@ describe('datasets', () => {
           'keyword',
           'resourceType',
           'representationType',
-          'producer',
-          'publisher',
+          'producerOrg',
+          'publisherOrg',
         ])
       cy.screenshot({ capture: 'viewport' })
     })
 
-    describe('publisher filter', () => {
+    describe('organization filter', () => {
       beforeEach(() => {
         cy.get('@filters').eq(0).click()
         getFilterOptions()

diff --git a/apps/datahub/src/app/home/home-header/home-header.component.spec.ts b/apps/datahub/src/app/home/home-header/home-header.component.spec.ts
@@ -31,7 +31,7 @@ jest.mock('@geonetwork-ui/util/app-config', () => {
         {
           sort: '-createDate',
           name: 'sortCeatedDateAndOrg',
-          filters: { publisher: ['DREAL'] },
+          filters: { organization: ['DREAL'] },
         },
         {
           name: 'filterCarto',

diff --git a/apps/datahub/src/app/home/search/search-filters/search-filters.component.spec.ts b/apps/datahub/src/app/home/search/search-filters/search-filters.component.spec.ts
@@ -27,7 +27,7 @@ import { PlatformServiceInterface } from '@geonetwork-ui/common/domain/platform.
 jest.mock('@geonetwork-ui/util/app-config', () => ({
   getOptionalSearchConfig: () => ({
     ADVANCED_FILTERS: [
-      'publisher',
+      'publisherOrg',
       'format',
       'isSpatial',
       'documentStandard',
@@ -92,7 +92,7 @@ class FieldsServiceMock {
   )
   public get supportedFields() {
     return [
-      'publisher',
+      'publisherOrg',
       'format',
       'isSpatial',
       'documentStandard',
@@ -294,7 +294,7 @@ describe('SearchFiltersComponent', () => {
           filter_format: {},
           filter_publicationYear: {},
           filter_isSpatial: {},
-          filter_publisher: {},
+          filter_publisherOrg: {},
           filter_topic: {},
           filter_license: {},
           filter_documentStandard: {},

diff --git a/apps/datahub/src/app/organization/organization-details/organization-details.component.html b/apps/datahub/src/app/organization/organization-details/organization-details.component.html
@@ -33,7 +33,7 @@
             <a
               data-test="organizationDatasetCount"
               [routerLink]="['/', ROUTER_ROUTE_SEARCH]"
-              [queryParams]="{ publisher: organization.name }"
+              [queryParams]="{ organization: organization.name }"
             >
               <gn-ui-figure
                 class="py-[37px] pl-[47px] rounded-lg border bg-white mb-5 card-shadow cursor-pointer"
@@ -82,7 +82,7 @@
                 <div class="ml-auto">
                   <a
                     [routerLink]="['/', ROUTER_ROUTE_SEARCH]"
-                    [queryParams]="{ publisher: organization.name }"
+                    [queryParams]="{ organization: organization.name }"
                     class="gn-ui-btn-primary h-[34px] rounded-lg"
                     data-test="orgDetailsSearchAllBtn"
                     translate

diff --git a/.../datahub/src/app/organization/organization-details/organization-details.component.spec.ts b/.../datahub/src/app/organization/organization-details/organization-details.component.spec.ts
@@ -259,7 +259,7 @@ describe('OrganizationDetailsComponent', () => {
           expect(orgDetailsSearchAllBtn).toBeTruthy()
 
           expect(orgDetailsSearchAllBtn?.getAttribute('href')).toEqual(
-            `/${ROUTER_ROUTE_SEARCH}?publisher=${encodeURIComponent(
+            `/${ROUTER_ROUTE_SEARCH}?organization=${encodeURIComponent(
               anOrganizationWithManyDatasets.name
             )}`
           )

diff --git a/conf/default.toml b/conf/default.toml
@@ -79,9 +79,9 @@ background_color = "#fdfbff"
 # filter_geometry_data = '{ "coordinates": [...], "type": "Polygon" }'
 
 # The advanced search filters available to the user can be customized with this setting.
-# The following fields can be used for filtering: 'publisher', 'format', 'publicationYear', 'standard', 'inspireKeyword', 'keyword', 'topic', 'isSpatial', 'license', 'resourceType', 'representationType'
+# The following fields can be used for filtering: 'organization', 'format', 'publicationYear', 'standard', 'inspireKeyword', 'keyword', 'topic', 'isSpatial', 'license', 'resourceType', 'representationType'
 # any other field will be ignored
-# advanced_filters = ['publisher', 'format', 'publicationYear', 'topic', 'isSpatial', 'license']
+# advanced_filters = ['organization', 'format', 'publicationYear', 'topic', 'isSpatial', 'license']
 
 # One or several search presets can be defined here; every search preset is composed of:
 # - a name (which can be a translation key)
@@ -90,7 +90,7 @@ background_color = "#fdfbff"
 # [[search_preset]]
 #     name = 'filterByName'
 #     filters.q = 'Full text search'
-#     filters.publisher = ['Org 1', 'Org 2']
+#     filters.organization = ['Org 1', 'Org 2']
 #     filters.format = ['format 1', 'format 2']
 #     filters.documentStandard = ['iso19115-3.2018']
 #     filters.inspireKeyword = ['keyword 1', 'keyword 2']

diff --git a/docs/guide/configure.md b/docs/guide/configure.md
@@ -151,7 +151,7 @@ For a list of supported search fields, see [this documentation page](../referenc
 The filters should be provided as an array, for instance:
 
 ```toml
-advanced_filters = ['publisher', 'inspireKeyword', 'keyword', 'topic']
+advanced_filters = ['organization', 'inspireKeyword', 'keyword', 'topic']
 ```
 
 - `[[search_preset]]` (multiple, optional)
@@ -171,7 +171,7 @@ advanced_filters = ['publisher', 'inspireKeyword', 'keyword', 'topic']
   [[search_preset]]
   name = 'filterByName'
   filters.q = 'full text search'
-  filters.publisher = ['Org 1', 'Org 2']
+  filters.organization = ['Org 1', 'Org 2']
   filters.format = ['format 1', 'format 2']
   filters.documentStandard = ['iso19115-3.2018']
   filters.inspireKeyword = ['keyword 1', 'keyword 2']

diff --git a/libs/feature/router/src/lib/default/state/router.effects.spec.ts b/libs/feature/router/src/lib/default/state/router.effects.spec.ts
@@ -44,7 +44,7 @@ const initialParams: Params = {
 
 class FieldsServiceMock {
   mapping = {
-    publisher: 'OrgForResource',
+    organization: 'OrgForResource',
     q: 'any',
   }
   buildFiltersFromFieldValues = jest.fn((fieldValues) =>

diff --git a/libs/feature/search/src/lib/utils/service/fields.service.spec.ts b/libs/feature/search/src/lib/utils/service/fields.service.spec.ts
@@ -99,8 +99,8 @@ describe('FieldsService', () => {
           'q',
           'license',
           'owner',
-          'producer',
-          'publisher',
+          'producerOrg',
+          'publisherOrg',
         ])
       })
     })
@@ -182,8 +182,8 @@ describe('FieldsService', () => {
           resourceType: [],
           topic: [],
           owner: [],
-          producer: [],
-          publisher: [],
+          producerOrg: [],
+          publisherOrg: [],
         })
       })
     })