geonetwork-ui 2.3.2 → 2.4.0-dev.0925104f

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

@@ -1,7 +1,6 @@
 import { DatasetRecord } from '../../../../../libs/common/domain/src/lib/model/record'
-import { deepFreeze } from './utils'
 
-export const DATASET_RECORDS: DatasetRecord[] = deepFreeze([
+export const datasetRecordsFixture = () => [
   {
     uniqueIdentifier: 'my-dataset-001',
     kind: 'dataset',
@@ -259,4 +258,208 @@ Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur
     updateFrequency: 'unknown',
     languages: ['fr', 'de'],
   },
-])
+]
+
+export const simpleDatasetRecordFixture = (): DatasetRecord => ({
+  uniqueIdentifier: 'my-dataset-001',
+  kind: 'dataset',
+  languages: [],
+  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' },
+  contacts: [
+    {
+      email: 'bob@org.net',
+      position: 'developer',
+      organization: { name: 'MyOrganization' },
+      role: 'point_of_contact',
+      firstName: 'Bob',
+      lastName: 'TheGreat',
+    },
+  ],
+  contactsForResource: [],
+  keywords: [],
+  topics: ['testData'],
+  licenses: [],
+  legalConstraints: [],
+  securityConstraints: [],
+  otherConstraints: [],
+  lineage: 'This record was edited manually to test the conversion processes',
+  spatialRepresentation: 'grid',
+  overviews: [],
+  spatialExtents: [],
+  temporalExtents: [],
+  distributions: [
+    {
+      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',
+    },
+  ],
+  updateFrequency: { per: 'month', updatedTimes: 3 },
+})
+
+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>
+            <mcc:code>
+                <gco:CharacterString>my-dataset-001</gco:CharacterString>
+            </mcc:code>
+        </mcc:MD_Identifier>
+    </mdb:metadataIdentifier>
+    <mdb:metadataScope>
+        <mdb:MD_MetadataScope>
+            <mdb:resourceScope>
+                <mcc:MD_ScopeCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_ScopeCode" codeListValue="dataset">dataset</mcc:MD_ScopeCode>
+            </mdb:resourceScope>
+        </mdb:MD_MetadataScope>
+    </mdb:metadataScope>
+    <mdb:contact>
+        <cit:CI_Responsibility>
+            <cit:role>
+                <cit:CI_RoleCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_RoleCode" codeListValue="pointOfContact">pointOfContact</cit:CI_RoleCode>
+            </cit:role>
+            <cit:party>
+                <cit:CI_Organisation>
+                    <cit:name>
+                        <gco:CharacterString>MyOrganization</gco:CharacterString>
+                    </cit:name>
+                    <cit:contactInfo>
+                        <cit:CI_Contact>
+                            <cit:address>
+                                <cit:CI_Address>
+                                    <cit:electronicMailAddress>
+                                        <gco:CharacterString>bob@org.net</gco:CharacterString>
+                                    </cit:electronicMailAddress>
+                                </cit:CI_Address>
+                            </cit:address>
+                        </cit:CI_Contact>
+                    </cit:contactInfo>
+                    <cit:individual>
+                        <cit:CI_Individual>
+                            <cit:name>
+                                <gco:CharacterString>Bob TheGreat</gco:CharacterString>
+                            </cit:name>
+                            <cit:positionName>
+                                <gco:CharacterString>developer</gco:CharacterString>
+                            </cit:positionName>
+                        </cit:CI_Individual>
+                    </cit:individual>
+                </cit:CI_Organisation>
+            </cit:party>
+        </cit:CI_Responsibility>
+    </mdb:contact>
+    <mdb:dateInfo>
+        <cit:CI_Date>
+            <cit:date>
+                <gco:DateTime>2022-02-01T15:12:00</gco:DateTime>
+            </cit:date>
+            <cit:dateType>
+                <cit:CI_DateTypeCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_DateTypeCode" codeListValue="revision">revision</cit:CI_DateTypeCode>
+            </cit:dateType>
+        </cit:CI_Date>
+    </mdb:dateInfo>
+    <mdb:identificationInfo>
+        <mri:MD_DataIdentification>
+            <mri:citation>
+                <cit:CI_Citation>
+                    <cit:title>
+                        <gco:CharacterString>A very interesting dataset (un jeu de données très intéressant)</gco:CharacterString>
+                    </cit:title>
+                    <cit:date>
+                        <cit:CI_Date>
+                            <cit:date>
+                                <gco:DateTime>2022-09-01T14:18:19</gco:DateTime>
+                            </cit:date>
+                            <cit:dateType>
+                                <cit:CI_DateTypeCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_DateTypeCode" codeListValue="creation">creation</cit:CI_DateTypeCode>
+                            </cit:dateType>
+                        </cit:CI_Date>
+                    </cit:date>
+                    <cit:date>
+                        <cit:CI_Date>
+                            <cit:date>
+                                <gco:DateTime>2022-12-04T15:12:00</gco:DateTime>
+                            </cit:date>
+                            <cit:dateType>
+                                <cit:CI_DateTypeCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_DateTypeCode" codeListValue="revision">revision</cit:CI_DateTypeCode>
+                            </cit:dateType>
+                        </cit:CI_Date>
+                    </cit:date>
+                </cit:CI_Citation>
+            </mri:citation>
+            <mri:abstract>
+                <gco:CharacterString>This dataset has been established for testing purposes.</gco:CharacterString>
+            </mri:abstract>
+            <mri:topicCategory>
+                <mri:MD_TopicCategoryCode>testData</mri:MD_TopicCategoryCode>
+            </mri:topicCategory>
+            <mri:status>
+                <mcc:MD_ProgressCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_ProgressCode" codeListValue="onGoing">onGoing</mcc:MD_ProgressCode>
+            </mri:status>
+            <mri:resourceMaintenance>
+                <mmi:MD_MaintenanceInformation>
+                    <mmi:userDefinedMaintenanceFrequency>
+                        <gco:TM_PeriodDuration>P0Y0M10D</gco:TM_PeriodDuration>
+                    </mmi:userDefinedMaintenanceFrequency>
+                </mmi:MD_MaintenanceInformation>
+            </mri:resourceMaintenance>
+            <mri:spatialRepresentationType>
+                <mcc:MD_SpatialRepresentationTypeCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_SpatialRepresentationTypeCode" codeListValue="grid">grid</mcc:MD_SpatialRepresentationTypeCode>
+            </mri:spatialRepresentationType>
+        </mri:MD_DataIdentification>
+    </mdb:identificationInfo>
+    <mdb:distributionInfo>
+        <mrd:MD_Distribution>
+            <mrd:distributionFormat>
+                <mrd:MD_Format>
+                    <mrd:formatSpecificationCitation>
+                        <cit:CI_Citation>
+                            <cit:title>
+                                <gco:CharacterString>x-gis/x-shapefile</gco:CharacterString>
+                            </cit:title>
+                        </cit:CI_Citation>
+                    </mrd:formatSpecificationCitation>
+                </mrd:MD_Format>
+            </mrd:distributionFormat>
+            <mrd:transferOptions>
+                <mrd:MD_DigitalTransferOptions>
+                    <mrd:onLine>
+                        <cit:CI_OnlineResource>
+                            <cit:linkage>
+                                <gco:CharacterString>http://my-org.net/download/1.zip</gco:CharacterString>
+                            </cit:linkage>
+                            <cit:description>
+                                <gco:CharacterString>Dataset downloaded as a shapefile</gco:CharacterString>
+                            </cit:description>
+                            <cit:name>
+                                <gco:CharacterString>Direct download</gco:CharacterString>
+                            </cit:name>
+                            <cit:protocol>
+                                <gco:CharacterString>WWW:DOWNLOAD</gco:CharacterString>
+                            </cit:protocol>
+                            <cit:function>
+                                <cit:CI_OnLineFunctionCode codeList="http://standards.iso.org/iso/19139/resources/gmxCodelists.xml#CI_OnLineFunctionCode" codeListValue="download"/>
+                            </cit:function>
+                        </cit:CI_OnlineResource>
+                    </mrd:onLine>
+                </mrd:MD_DigitalTransferOptions>
+            </mrd:transferOptions>
+        </mrd:MD_Distribution>
+    </mdb:distributionInfo>
+    <mdb:resourceLineage>
+        <mrl:LI_Lineage>
+            <mrl:statement>
+                <gco:CharacterString>This record was edited manually to test the conversion processes</gco:CharacterString>
+            </mrl:statement>
+        </mrl:LI_Lineage>
+    </mdb:resourceLineage>
+</mdb:MD_Metadata>`

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,38 @@ 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 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/datafeeder/src/openapi/model/datasetMetadata.api.model.ts

@@ -38,4 +38,8 @@ export interface DatasetMetadataApiModel {
    * textual description of dataset lineage
    */
   creationProcessDescription?: string
+  /**
+   * Optional, additional options for the dataset
+   */
+  options: any
 }

package/src/libs/data-access/datafeeder/src/openapi/model/datasetUploadStatus.api.model.ts

@@ -34,4 +34,6 @@ export interface DatasetUploadStatusApiModel {
    * detected charset
    */
   encoding?: string
+  format?: 'CSV' | 'SHAPEFILE'
+  options?: any
 }

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

@@ -4586,8 +4586,8 @@ export class RecordsApiService {
     accept?: string,
     observe?: 'body',
     reportProgress?: boolean,
-    options?: { httpHeaderAccept?: 'application/json' | 'application/xml' }
-  ): Observable<object>
+    options?: { httpHeaderAccept?: 'application/xml' | 'application/json' }
+  ): Observable<string>
   public getRecordAs(
     metadataUuid: string,
     addSchemaLocation?: boolean,
@@ -4598,8 +4598,8 @@ export class RecordsApiService {
     accept?: string,
     observe?: 'response',
     reportProgress?: boolean,
-    options?: { httpHeaderAccept?: 'application/json' | 'application/xml' }
-  ): Observable<HttpResponse<object>>
+    options?: { httpHeaderAccept?: 'application/xml' | 'application/json' }
+  ): Observable<HttpResponse<string>>
   public getRecordAs(
     metadataUuid: string,
     addSchemaLocation?: boolean,
@@ -4610,8 +4610,8 @@ export class RecordsApiService {
     accept?: string,
     observe?: 'events',
     reportProgress?: boolean,
-    options?: { httpHeaderAccept?: 'application/json' | 'application/xml' }
-  ): Observable<HttpEvent<object>>
+    options?: { httpHeaderAccept?: 'application/xml' | 'application/json' }
+  ): Observable<HttpEvent<string>>
   public getRecordAs(
     metadataUuid: string,
     addSchemaLocation?: boolean,
@@ -4622,7 +4622,7 @@ export class RecordsApiService {
     accept?: string,
     observe: any = 'body',
     reportProgress: boolean = false,
-    options?: { httpHeaderAccept?: 'application/json' | 'application/xml' }
+    options?: { httpHeaderAccept?: 'application/xml' | 'application/json' }
   ): Observable<any> {
     if (metadataUuid === null || metadataUuid === undefined) {
       throw new Error(
@@ -4677,8 +4677,8 @@ export class RecordsApiService {
     if (httpHeaderAcceptSelected === undefined) {
       // to determine the Accept header
       const httpHeaderAccepts: string[] = [
-        'application/json',
         'application/xml',
+        'application/json',
       ]
       httpHeaderAcceptSelected =
         this.configuration.selectHeaderAccept(httpHeaderAccepts)
@@ -4695,7 +4695,7 @@ export class RecordsApiService {
       responseType_ = 'text'
     }
 
-    return this.httpClient.get<object>(
+    return this.httpClient.get<string>(
       `${this.configuration.basePath}/records/${encodeURIComponent(
         String(metadataUuid)
       )}/formatters/xml`,
@@ -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/openapi/model/user.api.model.ts

@@ -21,7 +21,7 @@ export interface UserApiModel {
   emailAddresses?: Set<string>
   addresses?: Set<AddressApiModel>
   primaryAddress?: AddressApiModel
-  organisation?: string
+  organization?: string
   kind?: string
   lastLoginDate?: string
   authorities?: Array<GrantedAuthorityApiModel>

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
@@ -11114,16 +11106,15 @@ paths:
         default:
           description: default response
           content:
-            application/json: {}
+            application/xml:
+              schema:
+                type: string
         "200":
           description: Return the record.
           content:
             application/xml:
               schema:
-                type: object
-            application/json:
-              schema:
-                type: object
+                type: string
         "403":
           description: Operation not allowed. User needs to be able to view the resource.
           content:

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

@@ -1,4 +1,5 @@
 export * from './lib/feature-catalog.module'
+export * from './lib/organization-url.token'
 export * from './lib/sources/sources.service'
 export * from './lib/sources/sources.model'
 export * from './lib/records/records.service'

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

@@ -4,7 +4,6 @@ import { UiCatalogModule } from '../../../../../libs/ui/catalog/src'
 import {
   GroupsApiService,
   SearchApiService,
-  SiteApiService,
 } from '../../../../../libs/data-access/gn4/src'
 import { CommonModule } from '@angular/common'
 import { SourceLabelComponent } from './source-label/source-label.component'

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

@@ -19,7 +19,7 @@
     [showContent]="!!organisation.name"
   >
     <gn-ui-organisation-preview
-      [organisation]="organisation"
+      [organization]="organisation"
       [organisationUrl]="getOrganisationUrl(organisation)"
       (clickedOrganisation)="orgSelect.emit($event)"
     ></gn-ui-organisation-preview>

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

@@ -10,10 +10,10 @@ import {
 import { Organization } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs'
 import { map, startWith, tap } from 'rxjs/operators'
-import { ORGANIZATION_URL_TOKEN } from '../feature-catalog.module'
 import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
 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'
 
 @Component({
   selector: 'gn-ui-organisations',
@@ -28,7 +28,7 @@ export class OrganisationsComponent {
   constructor(
     private organisationsService: OrganizationsServiceInterface,
     @Optional()
-    @Inject(ORGANIZATION_URL_TOKEN)
+    @Inject(ORGANIZATION_PAGE_URL_TOKEN)
     private urlTemplate: string
   ) {}
 

package/src/libs/feature/catalog/src/lib/organization-url.token.ts

@@ -0,0 +1,6 @@
+import { InjectionToken } from '@angular/core'
+
+// expects the replacement key ${name}
+export const ORGANIZATION_PAGE_URL_TOKEN = new InjectionToken<string>(
+  'organization-page-url-token'
+)

package/src/libs/feature/catalog/src/lib/records/records.service.ts

@@ -1,18 +1,16 @@
 import { Injectable } from '@angular/core'
-import { Observable, of } from 'rxjs'
-import { catchError, shareReplay } from 'rxjs/operators'
+import { Observable, of, switchMap } from 'rxjs'
+import { shareReplay } from 'rxjs/operators'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 
 @Injectable({
   providedIn: 'root',
 })
 export class RecordsService {
-  recordsCount$: Observable<number> = this.recordsRepository
-    .getMatchesCount({})
-    .pipe(
-      shareReplay(1),
-      catchError(() => of(0))
-    )
+  recordsCount$: Observable<number> = of(true).pipe(
+    switchMap(() => this.recordsRepository.getMatchesCount({})),
+    shareReplay(1)
+  )
 
   constructor(private recordsRepository: RecordsRepositoryInterface) {}
 }

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,