feat: getting record logo as fallback if it is set in contact

geonetwork · Jul 11, 2023 · 0b6a439 · 0b6a439
1 parent 70e0784
commit 0b6a439
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/libs/feature/catalog/src/lib/organisations/service/organisations-from-groups.service.ts b/libs/feature/catalog/src/lib/organisations/service/organisations-from-groups.service.ts
@@ -16,7 +16,7 @@ import {
   selectField,
   SourceWithUnknownProps,
 } from '@geonetwork-ui/util/shared'
-import { combineLatest, forkJoin, Observable, of } from 'rxjs'
+import { forkJoin, Observable, of } from 'rxjs'
 import { map, shareReplay } from 'rxjs/operators'
 import { OrganisationsServiceInterface } from './organisations.service.interface'
 import { TranslateService } from '@ngx-translate/core'
@@ -132,7 +132,7 @@ export class OrganisationsFromGroupsService
     const groupId = parseInt(selectField(source, 'groupOwner'))
     const resourceContacts = getAsArray(
       selectField(source, 'contactForResource')
-    ).map((contact) => mapContact(contact))
+    ).map((contact) => mapContact(contact, source))
     return this.groups$.pipe(
       map((groups) => {
         const group = groups.find((g) => g.id === groupId)

diff --git a/libs/feature/catalog/src/lib/organisations/service/organisations-from-metadata.service.ts b/libs/feature/catalog/src/lib/organisations/service/organisations-from-metadata.service.ts
@@ -164,14 +164,17 @@ export class OrganisationsFromMetadataService
   }
 
   private mapContactFromOrganisation(
-    organisation: Organisation
+    organisation: Organisation,
+    contact: MetadataContact
   ): MetadataContact {
-    const logoUrl = getAsUrl(`${organisation.logoUrl}`)
+    const logoUrl = organisation.logoUrl
+      ? getAsUrl(`${organisation.logoUrl}`)
+      : contact.logoUrl
     return {
       name: organisation.name,
       organisation: organisation.name,
       email: organisation.email,
-      ...(organisation.logoUrl && logoUrl && { logoUrl }),
+      logoUrl: logoUrl,
     } as MetadataContact
   }
 
@@ -202,11 +205,11 @@ export class OrganisationsFromMetadataService
       ...record,
       resourceContacts: [
         ...getAsArray(selectField(source, 'contactForResource')).map(
-          (contact) => mapContact(contact)
+          (contact) => mapContact(contact, source)
         ),
       ],
       contact: {
-        ...mapContact(getFirstValue(selectField(source, 'contact'))),
+        ...mapContact(getFirstValue(selectField(source, 'contact')), source),
       },
     }
 
@@ -218,10 +221,13 @@ export class OrganisationsFromMetadataService
         )[0]
 
         if (org) {
-          const contactFromOrg = this.mapContactFromOrganisation(org)
+          const contactFromOrg = this.mapContactFromOrganisation(
+            org,
+            metadataRecord.contact
+          )
           metadataRecord.contact = contactFromOrg
           metadataRecord.resourceContacts = [
-            contactFromOrg,
+            contactFromOrg, // FIXME: this should go into an organization field
             ...metadataRecord.resourceContacts,
           ]
         }

diff --git a/libs/util/shared/src/lib/utils/atomic-operations.ts b/libs/util/shared/src/lib/utils/atomic-operations.ts
@@ -50,15 +50,16 @@ export const getAsUrl = (field) => {
 }
 
 export const mapLogo = (source: SourceWithUnknownProps) => {
-  const logo = selectField(source, 'logoUrl')
+  const logo = selectFallbackFields(source, 'logoUrl', 'logo')
   return logo ? getAsUrl(`/geonetwork${logo}`) : null
 }
 
 export const mapContact = (
-  sourceContact: SourceWithUnknownProps
+  sourceContact: SourceWithUnknownProps,
+  sourceRecord: SourceWithUnknownProps
 ): MetadataContact => {
   const website = getAsUrl(selectField<string>(sourceContact, 'website'))
-  const logoUrl = mapLogo(sourceContact)
+  const logoUrl = mapLogo(sourceContact) || mapLogo(sourceRecord)
   const address = selectField<string>(sourceContact, 'address')
   const phone = selectField<string>(sourceContact, 'phone')
   return {