diff --git a/apps/datahub-e2e/src/e2e/datasets.cy.ts b/apps/datahub-e2e/src/e2e/datasets.cy.ts index c19ff052f7..ae4fcd8811 100644 --- 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 index 1d764bdd72..2ff6c089db 100644 --- 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 index 96b24e0406..9b838003c4 100644 --- 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 index 4147dd8a79..39f8da6180 100644 --- 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 @@ { 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 index f0640402a3..33cf49335d 100644 --- 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 index 601788b76b..5be8bb6cd3 100644 --- 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 index 4936c377e5..53c7591496 100644 --- 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 index 3a71e24620..eaf8b09deb 100644 --- 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: [], }) }) })