geonetwork-ui 2.4.0-dev.fe59f179 → 2.4.1-dev.4e8752d34

package/src/libs/common/fixtures/src/lib/records.fixtures.ts

@@ -1,7 +1,11 @@
-import { DatasetRecord } from '../../../../../libs/common/domain/src/lib/model/record'
-import { deepFreeze } from './utils'
+import {
+  CatalogRecord,
+  DatasetRecord,
+  DatasetSpatialExtent,
+  Keyword,
+} from '../../../../../libs/common/domain/src/lib/model/record'
 
-export const DATASET_RECORDS: DatasetRecord[] = deepFreeze([
+export const datasetRecordsFixture: () => CatalogRecord[] = () => [
   {
     uniqueIdentifier: 'my-dataset-001',
     kind: 'dataset',
@@ -88,7 +92,7 @@ Cette section contient des *caractères internationaux* (ainsi que des "caractè
     ],
     topics: ['testData', 'exampleData'],
     spatialRepresentation: 'grid',
-    distributions: [
+    onlineResources: [
       {
         type: 'download',
         url: new URL('http://my-org.net/download/1.zip'),
@@ -129,10 +133,6 @@ Cette section contient des *caractères internationaux* (ainsi que des "caractè
     lineage: `This record was edited manually to test the conversion processes
 
 As such, **it is not very interesting at all.**`,
-    useLimitations: [
-      'Should only be used as a testing tool',
-      'Might cause minor annoyance in people',
-    ],
     licenses: [
       {
         text: 'Licence ODbL mai 2013 (basée sur ODbL 1.0)',
@@ -142,11 +142,9 @@ As such, **it is not very interesting at all.**`,
     legalConstraints: [
       {
         text: "Dataset access isn't possible since it does not really exist",
-        type: 'other',
       },
       {
         text: 'Contains sensitive information related to national defense',
-        type: 'security',
       },
     ],
     securityConstraints: [],
@@ -157,7 +155,8 @@ As such, **it is not very interesting at all.**`,
       updatedTimes: 3,
       per: 'month',
     },
-    languages: ['en'],
+    otherLanguages: ['de'],
+    defaultLanguage: 'en',
   },
   {
     uniqueIdentifier: '7d002c4c-92ef-4b9f-a568-d732f740b99e',
@@ -178,7 +177,7 @@ As such, **it is not very interesting at all.**`,
     contactsForResource: [],
     recordCreated: new Date('2022-04-15T14:18:19'),
     recordUpdated: new Date('2022-04-15T14:18:19'),
-    datasetUpdated: new Date('2022-03-29'),
+    resourceUpdated: new Date('2022-03-29'),
     title:
       "Plan local d'urbanisme (PLU) dématérialisé - commune d'Avrigny - approbation du 29/03/2022",
     abstract: `Plan local d'urbanisme (PLU) dématérialisé - commune d'Avrigny - approbation du 29/03/2022.
@@ -223,7 +222,7 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
     ],
     topics: ['Usage des sols', "document d'urbanisme"],
     spatialRepresentation: 'vector',
-    distributions: [
+    onlineResources: [
       {
         type: 'download',
         url: new URL(
@@ -247,7 +246,6 @@ Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur
     legalConstraints: [],
     securityConstraints: [],
     otherConstraints: [],
-    useLimitations: ["Aucune condition ne s'applique", 'Licence Ouverte 2.0'],
     licenses: [
       {
         text: "En dépit des efforts et diligences mis en œuvre pour en vérifier la fiabilité, le fournisseur n’est pas en mesure de garantir l’exactitude, la mise à jour, l’intégrité, l’exhaustivité des données et en particulier que les données sont exemptes d'erreurs, notamment de localisation, d’identification ou d’actualisation ou d’imprécisions. Les données ne sont pas fournies en vue d'une utilisation particulière et aucune garantie quant à leur aptitude à un usage particulier n'est apportée par le fournisseur. En conséquence, les utilisateurs utilisent les données sous leur responsabilité pleine et entière, à leurs risques et périls, sans recours possible contre le fournisseur dont la responsabilité ne saurait être engagée du fait d’un dommage résultant directement ou indirectement de l’utilisation de ces données. En particulier, il appartient aux utilisateurs d’apprécier, sous leur seule responsabilité : – l'opportunité d'utiliser les données ; – la compatibilité des fichiers avec leurs systèmes informatiques ; – l’adéquation des données à leurs besoins ; – qu’ils disposent de la compétence suffisante pour utiliser les données ; – l’opportunité d’utiliser la documentation ou les outils d’analyse fournis ou préconisés, en relation avec l’utilisation des données, le cas échéant. Le fournisseur n’est en aucune façon responsable des éléments extérieurs aux données et notamment des outils d’analyse, matériels, logiciels, réseaux..., utilisés pour consulter et/ou traiter les données, même s’il a préconisé ces éléments. L’utilisateur veille à vérifier que l’actualité des informations mises à disposition est compatible avec l’usage qu’il en fait.",
@@ -257,26 +255,28 @@ Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur
     temporalExtents: [],
     status: 'completed',
     updateFrequency: 'unknown',
-    languages: ['fr', 'de'],
+    otherLanguages: ['en', 'de'],
+    defaultLanguage: 'fr',
   },
-])
+]
 
-export const DATASET_RECORD_SIMPLE: DatasetRecord = {
+export const simpleDatasetRecordFixture = (): DatasetRecord => ({
   uniqueIdentifier: 'my-dataset-001',
   kind: 'dataset',
-  languages: [],
+  otherLanguages: [],
+  defaultLanguage: 'en',
   recordUpdated: new Date('2022-02-01T14:12:00.000Z'),
   resourceCreated: new Date('2022-09-01T12:18:19.000Z'),
   resourceUpdated: new Date('2022-12-04T14:12:00.000Z'),
   status: 'ongoing',
   title: 'A very interesting dataset (un jeu de données très intéressant)',
   abstract: `This dataset has been established for testing purposes.`,
-  ownerOrganization: { name: 'MyOrganization' },
+  ownerOrganization: { name: 'MyOrganization', translations: {} },
   contacts: [
     {
       email: 'bob@org.net',
       position: 'developer',
-      organization: { name: 'MyOrganization' },
+      organization: { name: 'MyOrganization', translations: {} },
       role: 'point_of_contact',
       firstName: 'Bob',
       lastName: 'TheGreat',
@@ -294,19 +294,22 @@ export const DATASET_RECORD_SIMPLE: DatasetRecord = {
   overviews: [],
   spatialExtents: [],
   temporalExtents: [],
-  distributions: [
+  onlineResources: [
     {
       type: 'download',
       url: new URL('http://my-org.net/download/1.zip'),
       name: 'Direct download',
       description: 'Dataset downloaded as a shapefile',
       mimeType: 'x-gis/x-shapefile',
+      translations: {},
     },
   ],
   updateFrequency: { per: 'month', updatedTimes: 3 },
-}
+  translations: {},
+})
 
-export const DATASET_RECORD_SIMPLE_AS_XML = `<?xml version="1.0" encoding="UTF-8"?>
+export const simpleDatasetRecordAsXmlFixture =
+  (): string => `<?xml version="1.0" encoding="UTF-8"?>
 <mdb:MD_Metadata xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0" xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0" xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/2.0">
     <mdb:metadataIdentifier>
         <mcc:MD_Identifier>
@@ -463,3 +466,102 @@ export const DATASET_RECORD_SIMPLE_AS_XML = `<?xml version="1.0" encoding="UTF-8
         </mrl:LI_Lineage>
     </mdb:resourceLineage>
 </mdb:MD_Metadata>`
+
+export const NATIONAL_KEYWORD = {
+  key: 'http://inspire.ec.europa.eu/metadata-codelist/SpatialScope/national',
+  label: 'National',
+  description: '',
+  type: 'theme',
+}
+
+export const SAMPLE_PLACE_KEYWORDS: Keyword[] = [
+  // these keywords come from a thesaurus available locally
+  {
+    key: 'uri1',
+    label: 'Berlin',
+    thesaurus: {
+      id: '1',
+      name: 'places',
+    },
+    type: 'place',
+    bbox: [13.27, 52.63, 52.5, 13.14],
+  },
+  {
+    key: 'uri2',
+    label: 'Hamburg',
+    thesaurus: {
+      id: '1',
+      name: 'places',
+    },
+    type: 'place',
+    bbox: [10.5, 53.66, 53.53, 10],
+  },
+  // this keyword is available locally but has no extent linked to it
+  {
+    key: 'uri3',
+    label: 'Munich',
+    thesaurus: {
+      id: '1',
+      name: 'places',
+    },
+    type: 'place',
+    bbox: [11.64, 48.65, 48.51, 11.5],
+  },
+  // this keyword comes from a thesaurus not available locally
+  {
+    label: 'Europe',
+    thesaurus: {
+      id: '2',
+      name: 'otherPlaces',
+    },
+    type: 'place',
+  },
+  // this keyword has no thesaurus
+  {
+    label: 'Narnia',
+    type: 'place',
+  },
+]
+
+// records coming from XML do not have a key or a bbox in them
+export const SAMPLE_PLACE_KEYWORDS_FROM_XML = SAMPLE_PLACE_KEYWORDS.map(
+  ({ label, thesaurus, type }) => ({
+    label,
+    type,
+    ...(thesaurus && { thesaurus }),
+  })
+)
+
+export const SAMPLE_SPATIAL_EXTENTS: DatasetSpatialExtent[] = [
+  // these extents are linked to keywords known locally
+  {
+    description: 'uri1',
+    bbox: [13.5, 52.5, 14.5, 53.5],
+  },
+  {
+    description: 'uri2',
+    bbox: [10, 53.5, 11, 53.4],
+  },
+  {
+    description: 'uri4',
+    bbox: [11.5, 48.5, 11.5, 48.3],
+  },
+  // this extent is linked to a keyword not available locally
+  {
+    description: 'URI-Paris',
+    bbox: [1, 2, 3, 4],
+  },
+  // this extent is not linked to any keyword
+  {
+    bbox: [5, 6, 7, 8],
+  },
+]
+
+export const SAMPLE_RECORD = {
+  ...datasetRecordsFixture()[0],
+  spatialExtents: SAMPLE_SPATIAL_EXTENTS,
+  keywords: [
+    ...datasetRecordsFixture()[0].keywords,
+    ...SAMPLE_PLACE_KEYWORDS_FROM_XML,
+  ],
+}

package/src/libs/common/fixtures/src/lib/repository.fixtures.ts

@@ -1,8 +1,8 @@
-import { deepFreeze } from './utils/freeze'
 import { SearchResults } from '../../../../../libs/common/domain/src/lib/model/search'
-import { DATASET_RECORDS } from './records.fixtures'
+import { datasetRecordsFixture } from './records.fixtures'
+import { CatalogRecord } from '../../../../../libs/common/domain/src/lib/model/record'
 
-export const SAMPLE_SEARCH_RESULTS: SearchResults = deepFreeze({
+export const searchResultsFixture = (): SearchResults => ({
   count: 123,
-  records: DATASET_RECORDS,
+  records: datasetRecordsFixture() as CatalogRecord[],
 })

package/src/libs/common/fixtures/src/lib/search/aggregations.ts

@@ -1,4 +1,3 @@
-import { deepFreeze } from '../utils/freeze'
 import {
   AggregationParams,
   Aggregations,
@@ -30,13 +29,13 @@ export const FILTERS_AGGREGATION: AggregationParams = {
     },
   },
 }
-export const SAMPLE_AGGREGATIONS_PARAMS: AggregationsParams = deepFreeze({
+export const SAMPLE_AGGREGATIONS_PARAMS = (): AggregationsParams => ({
   myField: TERMS_AGGREGATION,
   myValueField: HISTOGRAM_AGGREGATION,
   myFilters: FILTERS_AGGREGATION,
 })
 
-export const SAMPLE_AGGREGATIONS_RESULTS: Aggregations = deepFreeze({
+export const SAMPLE_AGGREGATIONS_RESULTS = (): Aggregations => ({
   myField: {
     buckets: [
       { term: 'Hungary', count: 20 },

package/src/libs/common/fixtures/src/lib/user-feedbacks.fixtures.ts

@@ -1,7 +1,18 @@
 import { UserFeedback } from '../../../../../libs/common/domain/src/lib/model/record'
-import { deepFreeze } from './utils'
 
-export const SOME_USER_FEEDBACKS: UserFeedback[] = deepFreeze([
+export const userFeedbackFixture = (): UserFeedback => ({
+  uuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
+  comment: 'A nice comment.',
+  metadataUUID: 'my-dataset-001',
+  authorUserId: '46798',
+  authorName: 'Arnaud De Maison',
+  authorEmail: 'a.demaison@geo2france.fr',
+  published: true,
+  parentUuid: undefined,
+  date: new Date('2023-01-01T08:00:00Z'),
+})
+
+export const someUserFeedbacksFixture = (): UserFeedback[] => [
   {
     uuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
     comment: 'A nice comment.',
@@ -68,16 +79,4 @@ export const SOME_USER_FEEDBACKS: UserFeedback[] = deepFreeze([
     parentUuid: undefined,
     date: new Date('2023-01-01T11:00:00Z'),
   },
-])
-
-export const A_USER_FEEDBACK: UserFeedback = deepFreeze({
-  uuid: '4ad03fb7-1728-424c-bdaa-aedd531b07a8',
-  comment: 'A nice comment.',
-  metadataUUID: 'my-dataset-001',
-  authorUserId: '46798',
-  authorName: 'Arnaud De Maison',
-  authorEmail: 'a.demaison@geo2france.fr',
-  published: true,
-  parentUuid: undefined,
-  date: new Date('2023-01-01T08:00:00Z'),
-})
+]

package/src/libs/common/fixtures/src/lib/user.fixtures.ts

@@ -1,6 +1,8 @@
 import { UserModel } from '../../../../../libs/common/domain/src/lib/model/user/user.model'
 
-export const USER_FIXTURE = (): UserModel => ({
+export const createUserFixture = (
+  overrides: Partial<UserModel> = {}
+): UserModel => ({
   id: '46798',
   profile: 'Administrator',
   username: 'Gravin',
@@ -10,23 +12,51 @@ export const USER_FIXTURE = (): UserModel => ({
   organisation: 'Région Hauts-de-France',
   profileIcon:
     'https://www.gravatar.com/avatar/dbdffd183622800bcf8587328daf43a6?d=mp',
+  ...overrides,
 })
 
-export const USER_FIXTURE_ANON = (): UserModel => ({
-  id: '161',
-  profile: 'Administrator',
-  username: 'ghost16',
-  name: 'Ghost',
-  surname: 'Old',
-  email: 'old.ghost@wiz.fr',
-  organisation: 'wizard-org',
-  profileIcon:
-    'https://www.gravatar.com/avatar/dbdffd183622800bcf8587328daf43a6?d=mp',
-})
+export const barbieUserFixture = (): UserModel =>
+  createUserFixture({
+    id: '46798',
+    profile: 'Administrator',
+    username: 'barbie',
+    name: 'Barbara',
+    surname: 'Roberts',
+    email: 'barbie@email.org',
+    organisation: 'Barbie Inc.',
+    profileIcon:
+      'https://www.gravatar.com/avatar/dbdffd183622800bcf8587328daf43a6?d=mp',
+  })
+
+export const johnDoeUserFixture = (): UserModel =>
+  createUserFixture({
+    id: '12345',
+    profile: 'User',
+    username: 'johndoe',
+    name: 'John',
+    surname: 'Doe',
+    email: 'johndoe@email.com',
+    organisation: 'Doe Enterprises',
+    profileIcon:
+      'https://www.gravatar.com/avatar/5f6d74eabcb57186a12f7c8ba40b4c9f?d=mp',
+  })
+
+export const ghostUserFixture = (): UserModel =>
+  createUserFixture({
+    id: '161',
+    profile: 'Administrator',
+    username: 'ghost',
+    name: 'Ghost',
+    surname: 'Old',
+    email: 'old.ghost@wiz.fr',
+    organisation: 'wizard-org',
+    profileIcon:
+      'https://www.gravatar.com/avatar/dbdffd183622800bcf8587328daf43a6?d=mp',
+  })
 
-export const USERS_FIXTURE = (): UserModel[] => [
-  USER_FIXTURE(),
-  USER_FIXTURE_ANON(),
+export const someUsersFixture = (): UserModel[] => [
+  barbieUserFixture(),
+  ghostUserFixture(),
   {
     id: '1',
     profile: 'Editor',

package/src/libs/data-access/gn4/src/fixtures/site.fixtures.ts

@@ -1,12 +1,12 @@
-export const SITE_FIXTURES = {
+export const siteFixture = () => ({
   'system/platform/subVersion': 'alpha.2',
   'system/platform/version': '4.0.0',
   'system/site/name': 'GeoNetwork 4',
   'system/site/organization': 'titellus',
   'system/site/siteId': '04fe602b-fc46-4e6b-ac5a-138c6153eceb',
-}
+})
 
-export const SETTINGS_FIXTURES = {
+export const settingsFixture = () => ({
   'system/site/name': 'GeoNetwork 4',
   'system/site/siteId': '04fe602b-fc46-4e6b-ac5a-138c6153eceb',
   'system/site/organization': 'titellus',
@@ -62,4 +62,4 @@ export const SETTINGS_FIXTURES = {
   'system/publication/doi/doilandingpagetemplate':
     'http://localhost:8080/geonetwork/srv/resources/records/{{uuid}}',
   'system/feedback/mailServer/hostIsDefined': false,
-}
+})

package/src/libs/data-access/gn4/src/fixtures/ui.fixtures.ts

@@ -1,5 +1,5 @@
-export const UI_FIXTURES = {
+export const uiFixture = () => ({
   id: 'srv',
   configuration:
     '{"langDetector":{"fromHtmlTag":false,"regexp":"^(?:/.+)?/.+/([a-z]{2,3})/.+","default":"eng"},"nodeDetector":{"regexp":"^(?:/.+)?/(.+)/[a-z]{2,3}/.+","default":"srv"},"serviceDetector":{"regexp":"^(?:/.+)?/.+/[a-z]{2,3}/(.+)","default":"catalog.search"},"baseURLDetector":{"regexp":"^((?:/.+)?)+/.+/[a-z]{2,3}/.+","default":"/geonetwork"},"mods":{"global":{"humanizeDates":true},"footer":{"enabled":true,"showSocialBarInFooter":true},"header":{"enabled":true,"languages":{"eng":"en","dut":"nl","fre":"fr","ger":"de","kor":"ko","spa":"es","cze":"cs","cat":"ca","fin":"fi","ice":"is","ita":"it","por":"pt","rus":"ru","chi":"zh","slo":"sk"},"isLogoInHeader":false,"logoInHeaderPosition":"left","fluidHeaderLayout":true,"showGNName":true,"isHeaderFixed":false},"cookieWarning":{"enabled":true,"cookieWarningMoreInfoLink":"","cookieWarningRejectLink":""},"home":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/catalog.search#/home","showSocialBarInFooter":true,"fluidLayout":true,"facetConfig":{"inspireThemeUri":{"terms":{"field":"inspireThemeUri","size":34}},"topic_text":{"terms":{"field":"topic_text","size":20}},"codelist_hierarchyLevel_text":{"terms":{"field":"codelist_hierarchyLevel_text","size":10}}}},"search":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/catalog.search#/search","hitsperpageValues":[30,60,120],"paginationInfo":{"hitsPerPage":30},"queryBase":"${any} resourceTitleObject.default:(${any})^2","scoreConfig":{"boost":"5","functions":[{"filter":{"exists":{"field":"parentUuid"}},"weight":0.3},{"filter":{"match":{"codelist_status":"obsolete"}},"weight":0.3},{"gauss":{"dateStamp":{"scale":"365d","offset":"90d","decay":0.5}}}],"score_mode":"multiply"},"autocompleteConfig":{"query":{"bool":{"must":[{"multi_match":{"query":"","type":"bool_prefix","fields":["resourceTitleObject.*","resourceAbstractObject.*","tag","resourceIdentifier"]}}]}},"_source":["resourceTitleObject"],"from":0,"size":20},"moreLikeThisConfig":{"more_like_this":{"fields":["resourceTitleObject.default","resourceAbstractObject.default","tag.raw"],"like":null,"min_term_freq":1,"max_query_terms":12}},"facetTabField":"","facetConfig":{"codelist_hierarchyLevel_text":{"terms":{"field":"codelist_hierarchyLevel_text"},"aggs":{"format":{"terms":{"field":"format"}}}},"codelist_spatialRepresentationType":{"terms":{"field":"codelist_spatialRepresentationType","size":10}},"availableInServices":{"filters":{"filters":{"availableInViewService":{"query_string":{"query":"+linkProtocol:/OGC:WMS.*/"}},"availableInDownloadService":{"query_string":{"query":"+linkProtocol:/OGC:WFS.*/"}}}}},"thesaurus_geonetworkthesaurusexternalthemegemet_tree":{"terms":{"field":"thesaurus_geonetworkthesaurusexternalthemegemet_tree","size":100,"order":{"_key":"asc"},"include":"[^/]+/?[^/]+"}},"tag":{"terms":{"field":"tag","include":".*","size":10}},"thesaurus_geonetworkthesaurusexternalplaceregions_tree":{"terms":{"field":"thesaurus_geonetworkthesaurusexternalplaceregions_tree","size":100,"order":{"_key":"asc"}}},"resolutionScaleDenominator":{"collapsed":true,"terms":{"field":"resolutionScaleDenominator","size":10,"order":{"_key":"asc"}}},"creationYearForResource":{"collapsed":true,"terms":{"field":"creationYearForResource","size":10,"order":{"_key":"desc"}}},"OrgForResource":{"terms":{"field":"OrgForResource","size":15}},"codelist_maintenanceAndUpdateFrequency_text":{"collapsed":true,"terms":{"field":"codelist_maintenanceAndUpdateFrequency_text","size":10}},"codelist_status_text":{"terms":{"field":"codelist_status_text","size":10}},"dateStamp":{"userHasRole":"isReviewerOrMore","auto_date_histogram":{"field":"dateStamp","buckets":50}}},"filters":null,"sortbyValues":[{"sortBy":"relevance","sortOrder":""},{"sortBy":"dateStamp","sortOrder":"desc"},{"sortBy":"createDate","sortOrder":"desc"},{"sortBy":"resourceTitleObject.default.keyword","sortOrder":""},{"sortBy":"rating","sortOrder":"desc"},{"sortBy":"popularity","sortOrder":"desc"}],"sortBy":"relevance","resultViewTpls":[{"tplUrl":"../../catalog/components/search/resultsview/partials/viewtemplates/grid.html","tooltip":"Grid","icon":"fa-th"},{"tplUrl":"../../catalog/components/search/resultsview/partials/viewtemplates/list.html","tooltip":"List","icon":"fa-bars"}],"resultTemplate":"../../catalog/components/search/resultsview/partials/viewtemplates/grid.html","formatter":{"list":[{"label":"defaultView","url":""},{"label":"full","url":"/formatters/xsl-view?root=div&view=advanced"}],"defaultUrl":""},"downloadFormatter":[{"label":"exportMEF","url":"/formatters/zip?withRelated=false","class":"fa-file-zip-o"},{"label":"exportPDF","url":"/formatters/xsl-view?output=pdf&language=${lang}","class":"fa-file-pdf-o"},{"label":"exportXML","url":"/formatters/xml","class":"fa-file-code-o"}],"grid":{"related":["parent","children","services","datasets"]},"linkTypes":{"links":["LINK","kml"],"downloads":["DOWNLOAD"],"layers":["OGC","ESRI:REST"],"maps":["ows"]},"isFilterTagsDisplayedInSearch":true,"usersearches":{"enabled":false,"displayFeaturedSearchesPanel":false},"savedSelection":{"enabled":false}},"map":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/catalog.search#/map","externalViewer":{"enabled":false,"enabledViewAction":false,"baseUrl":"http://www.example.com/viewer","urlTemplate":"http://www.example.com/viewer?url=${service.url}&type=${service.type}&layer=${service.title}&lang=${iso2lang}&title=${md.defaultTitle}","openNewWindow":false,"valuesSeparator":","},"is3DModeAllowed":false,"isSaveMapInCatalogAllowed":true,"isExportMapAsImageEnabled":false,"storage":"sessionStorage","bingKey":"","listOfServices":{"wms":[],"wmts":[]},"projection":"EPSG:3857","projectionList":[{"code":"urn:ogc:def:crs:EPSG:6.6:4326","label":"WGS84 (EPSG:4326)"},{"code":"EPSG:3857","label":"Google mercator (EPSG:3857)"}],"switcherProjectionList":[{"code":"EPSG:3857","label":"Google mercator (EPSG:3857)"}],"disabledTools":{"processes":false,"addLayers":false,"projectionSwitcher":false,"layers":false,"legend":false,"filter":false,"contexts":false,"print":false,"mInteraction":false,"graticule":false,"mousePosition":true,"syncAllLayers":false,"drawVector":false},"graticuleOgcService":{},"map-viewer":{"context":"../../map/config-viewer.xml","extent":[0,0,0,0],"layers":[]},"map-search":{"context":"../../map/config-viewer.xml","extent":[0,0,0,0],"layers":[]},"map-editor":{"context":"","extent":[0,0,0,0],"layers":[{"type":"osm"}]},"autoFitOnLayer":false},"geocoder":{"enabled":true,"appUrl":"https://secure.geonames.org/searchJSON"},"recordview":{"enabled":true,"isSocialbarEnabled":true},"editor":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/catalog.edit","isUserRecordsOnly":false,"minUserProfileToCreateTemplate":"","isFilterTagsDisplayed":false,"fluidEditorLayout":true,"createPageTpl":"../../catalog/templates/editor/new-metadata-horizontal.html","editorIndentType":"","allowRemoteRecordLink":true,"facetConfig":{"resourceType":{"terms":{"field":"resourceType","size":20}},"codelist_status_text":{"terms":{"field":"codelist_status_text","size":15}},"sourceCatalogue":{"terms":{"field":"sourceCatalogue","size":15}},"isValid":{"terms":{"field":"isValid","size":10}},"isValidInspire":{"terms":{"field":"isValidInspire","size":10}},"groupOwner":{"terms":{"field":"groupOwner","size":10}},"recordOwner":{"terms":{"field":"recordOwner","size":10}},"groupPublished":{"terms":{"field":"groupPublished","size":10}},"documentStandard":{"terms":{"field":"documentStandard","size":10}},"isHarvested":{"terms":{"field":"isHarvested","size":2}},"isTemplate":{"terms":{"field":"isTemplate","size":5}},"isPublishedToAll":{"terms":{"field":"isPublishedToAll","size":2}}}},"admin":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/admin.console"},"signin":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/catalog.signin"},"signout":{"appUrl":"../../signout"},"page":{"enabled":true,"appUrl":"../../{{node}}/{{lang}}/catalog.search#/page"}}}',
-}
+})

package/src/libs/data-access/gn4/src/openapi/api/records.api.service.ts

@@ -7201,11 +7201,7 @@ export class RecordsApiService {
     }
 
     // to determine the Content-Type header
-    const consumes: string[] = [
-      'application/xml',
-      'application/json',
-      'application/x-www-form-urlencoded',
-    ]
+    const consumes: string[] = ['application/xml']
     const httpContentTypeSelected: string | undefined =
       this.configuration.selectHeaderContentType(consumes)
     if (httpContentTypeSelected !== undefined) {

package/src/libs/data-access/gn4/src/spec.yaml

@@ -1832,14 +1832,6 @@ paths:
             schema:
               type: string
               description: XML fragment.
-          application/json:
-            schema:
-              type: string
-              description: XML fragment.
-          application/x-www-form-urlencoded:
-            schema:
-              type: string
-              description: XML fragment.
       responses:
         default:
           description: default response

package/src/libs/feature/catalog/src/lib/feature-catalog.module.ts

@@ -1,6 +1,9 @@
 import { InjectionToken, NgModule } from '@angular/core'
 import { SiteTitleComponent } from './site-title/site-title.component'
-import { UiCatalogModule } from '../../../../../libs/ui/catalog/src'
+import {
+  CatalogTitleComponent,
+  OrganisationsFilterComponent,
+} from '../../../../../libs/ui/catalog/src'
 import {
   GroupsApiService,
   SearchApiService,
@@ -8,7 +11,6 @@ import {
 import { CommonModule } from '@angular/common'
 import { SourceLabelComponent } from './source-label/source-label.component'
 import { LangService, UtilI18nModule } from '../../../../../libs/util/i18n/src'
-import { OrganisationsComponent } from './organisations/organisations.component'
 import { UiLayoutModule } from '../../../../../libs/ui/layout/src'
 import { TranslateModule, TranslateService } from '@ngx-translate/core'
 import { UiElementsModule } from '../../../../../libs/ui/elements/src'
@@ -52,20 +54,17 @@ const organizationsServiceFactory = (
       )
 
 @NgModule({
-  declarations: [
-    SiteTitleComponent,
-    SourceLabelComponent,
-    OrganisationsComponent,
-  ],
+  declarations: [SiteTitleComponent, SourceLabelComponent],
   imports: [
-    UiCatalogModule,
     UiLayoutModule,
     CommonModule,
     UtilI18nModule,
     TranslateModule.forChild(),
     UiElementsModule,
+    OrganisationsFilterComponent,
+    CatalogTitleComponent,
   ],
-  exports: [SiteTitleComponent, SourceLabelComponent, OrganisationsComponent],
+  exports: [SiteTitleComponent, SourceLabelComponent],
   providers: [
     {
       provide: OrganizationsServiceInterface,

package/src/libs/feature/catalog/src/lib/organisations/organisations.component.html

@@ -26,9 +26,5 @@
   </gn-ui-content-ghost>
 </div>
 <div class="py-20">
-  <gn-ui-pagination
-    [currentPage]="currentPage$ | async"
-    [nPages]="totalPages"
-    (newCurrentPageEvent)="setCurrentPage($event)"
-  ></gn-ui-pagination>
+  <gn-ui-pagination [listComponent]="this"></gn-ui-pagination>
 </div>

package/src/libs/feature/catalog/src/lib/organisations/organisations.component.ts

@@ -14,14 +14,31 @@ import { OrganizationsServiceInterface } from '../../../../../../libs/common/dom
 import { SortByField } from '../../../../../../libs/common/domain/src/lib/model/search'
 import { createFuzzyFilter } from '../../../../../../libs/util/shared/src'
 import { ORGANIZATION_PAGE_URL_TOKEN } from '../organization-url.token'
+import { ContentGhostComponent } from '../../../../../../libs/ui/elements/src'
+import { CommonModule } from '@angular/common'
+import {
+  OrganisationPreviewComponent,
+  OrganisationsFilterComponent,
+  OrganisationsResultComponent,
+} from '../../../../../../libs/ui/catalog/src'
+import { Paginable, PaginationComponent } from '../../../../../../libs/ui/layout/src'
 
 @Component({
   selector: 'gn-ui-organisations',
   templateUrl: './organisations.component.html',
   styleUrls: ['./organisations.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    CommonModule,
+    ContentGhostComponent,
+    OrganisationsFilterComponent,
+    OrganisationsResultComponent,
+    OrganisationPreviewComponent,
+    PaginationComponent,
+  ],
 })
-export class OrganisationsComponent {
+export class OrganisationsComponent implements Paginable {
   @Input() itemsOnPage = 12
   @Output() orgSelect = new EventEmitter<Organization>()
 
@@ -70,10 +87,6 @@ export class OrganisationsComponent {
     )
   )
 
-  protected setCurrentPage(page: number): void {
-    this.currentPage$.next(page)
-  }
-
   protected setFilterBy(value: string): void {
     this.currentPage$.next(1)
     this.filterBy$.next(value)
@@ -121,4 +134,27 @@ export class OrganisationsComponent {
     if (!this.urlTemplate) return null
     return this.urlTemplate.replace('${name}', organisation.name)
   }
+
+  // Paginable API
+  get isFirstPage() {
+    return this.currentPage === 1
+  }
+  get isLastPage() {
+    return this.currentPage === this.totalPages
+  }
+  get pagesCount() {
+    return this.totalPages
+  }
+  get currentPage() {
+    return this.currentPage$.value
+  }
+  goToPage(index: number) {
+    this.currentPage$.next(index)
+  }
+  goToNextPage() {
+    this.goToPage(this.currentPage + 1)
+  }
+  goToPrevPage() {
+    this.goToPage(this.currentPage - 1)
+  }
 }

package/src/libs/feature/catalog/src/lib/sources/sources.fixture.ts

@@ -1,4 +1,4 @@
-export const SOURCES_FIXTURE = [
+export const someSourcesFixture = () => [
   {
     type: 'harvester',
     logo: null,

package/src/libs/feature/dataviz/src/index.ts

@@ -1,4 +1,3 @@
-export * from './lib/feature-dataviz.module'
 export * from './lib/service/data.service'
 export * from './lib/chart-view/chart-view.component'
 export * from './lib/figure/figure-container/figure-container.component'

package/src/libs/feature/dataviz/src/lib/chart-view/chart-view.component.html

@@ -53,7 +53,7 @@
     <gn-ui-popup-alert
       *ngIf="error"
       type="warning"
-      icon="error_outline"
+      icon="matErrorOutlineOutline"
       class="absolute m-2 inset-0"
     >
       <span>{{ error }}</span>