geonetwork-ui 2.10.0-dev.b5836aad7 → 2.10.0-dev.b6696be21

package/src/libs/ui/elements/src/lib/contact-pill/contact-pill.component.html

@@ -0,0 +1,41 @@
+<gn-ui-button
+  [type]="overlayOpen ? 'gray-light' : 'primary-light'"
+  extraClass="group w-full min-h-12 gap-3 justify-between py-2 pl-5 pr-4 rounded"
+  data-test="contact-pill"
+  (buttonClick)="toggleOverlay()"
+  cdkOverlayOrigin
+  #overlayOrigin="cdkOverlayOrigin"
+>
+  <span
+    class="font-title font-medium text-base leading-tight truncate"
+    [class]="!overlayOpen ? 'text-primary-black group-hover:text-white' : ''"
+    [title]="displayName"
+    >{{ displayName }}</span
+  >
+  <div
+    class="gn-ui-card-icon items-center justify-center w-10 h-8"
+    [class]="
+      !overlayOpen ? 'group-hover:border-white group-hover:text-white' : ''
+    "
+  >
+    @if (overlayOpen) {
+      <ng-icon class="!w-6 !h-6 !text-[24px]" name="matClose"></ng-icon>
+    } @else {
+      <ng-icon class="!w-6 !h-6 !text-[24px]" name="matInfoOutline"></ng-icon>
+    }
+  </div>
+</gn-ui-button>
+
+<ng-template
+  cdkConnectedOverlay
+  [cdkConnectedOverlayOrigin]="overlayOrigin"
+  [cdkConnectedOverlayOpen]="overlayOpen"
+  [cdkConnectedOverlayPositions]="overlayPositions"
+  [cdkConnectedOverlayOffsetX]="overlayOffsetX"
+  (overlayOutsideClick)="closeOverlay()"
+  (detach)="closeOverlay()"
+>
+  <div [style.width.px]="overlayWidth">
+    <gn-ui-contact-details [contact]="contact"></gn-ui-contact-details>
+  </div>
+</ng-template>

package/src/libs/ui/elements/src/lib/contact-pill/contact-pill.component.ts

@@ -0,0 +1,70 @@
+import { ConnectedPosition, OverlayModule } from '@angular/cdk/overlay'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  inject,
+  Input,
+} from '@angular/core'
+import { Individual } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { NgIcon, provideIcons } from '@ng-icons/core'
+import { matClose } from '@ng-icons/material-icons/baseline'
+import { matInfoOutline } from '@ng-icons/material-icons/outline'
+import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
+import { getIndividualDisplayName } from '../../../../../../libs/util/shared/src'
+import { ContactDetailsComponent } from '../contact-details/contact-details.component'
+
+@Component({
+  selector: 'gn-ui-contact-pill',
+  templateUrl: './contact-pill.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [NgIcon, ButtonComponent, OverlayModule, ContactDetailsComponent],
+  viewProviders: [provideIcons({ matClose, matInfoOutline })],
+})
+export class ContactPillComponent {
+  @Input() contact: Individual
+
+  private host = inject(ElementRef<HTMLElement>)
+
+  overlayOpen = false
+  overlayWidth = 0
+  overlayOffsetX = 0
+  overlayPositions: ConnectedPosition[] = [
+    {
+      originX: 'start',
+      originY: 'bottom',
+      overlayX: 'start',
+      overlayY: 'top',
+      offsetY: 4,
+    },
+    {
+      originX: 'start',
+      originY: 'top',
+      overlayX: 'start',
+      overlayY: 'bottom',
+      offsetY: -4,
+    },
+  ]
+
+  get displayName(): string {
+    return getIndividualDisplayName(this.contact)
+  }
+
+  toggleOverlay() {
+    if (!this.overlayOpen) {
+      // Calculate the width and horizontal offset of the overlay to align it with the parent element
+      const parent =
+        this.host.nativeElement.parentElement.getBoundingClientRect()
+      const pill = this.host.nativeElement.getBoundingClientRect()
+      this.overlayWidth = parent.width
+      this.overlayOffsetX = parent.left - pill.left
+    }
+
+    this.overlayOpen = !this.overlayOpen
+  }
+
+  closeOverlay() {
+    this.overlayOpen = false
+  }
+}

package/src/libs/ui/elements/src/lib/internal-link-card/internal-link-card.component.html

@@ -1,6 +1,6 @@
 <a
   [attr.href]="linkHref"
-  [target]="linkTarget"
+  target="_self"
   class="record-card"
   [ngClass]="cardClass"
 >

package/src/libs/ui/elements/src/lib/internal-link-card/internal-link-card.component.ts

@@ -58,7 +58,6 @@ export class InternalLinkCardComponent implements OnInit {
   protected elementRef = inject(ElementRef)
 
   @Input() record: CatalogRecord
-  @Input() linkTarget = '_blank'
   @Input() linkHref: string = null
   @Input() metadataQualityDisplay: boolean
   @Input() favoriteTemplate: TemplateRef<{ $implicit: CatalogRecord }>

package/src/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.ts

@@ -21,7 +21,7 @@ import {
   matCallOutline,
   matLocationOnOutline,
 } from '@ng-icons/material-icons/outline'
-
+import { getAddressLines } from '../../../../../../libs/util/shared/src'
 import { TranslateDirective } from '@ngx-translate/core'
 
 @Component({
@@ -59,10 +59,7 @@ export class MetadataContactComponent {
   }
 
   get address() {
-    const addressParts = this.contacts[0].address
-      .split(',')
-      .map((part) => part.trim())
-    return addressParts
+    return getAddressLines(this.contacts[0]?.address)
   }
 
   onOrganizationClick() {

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.css

@@ -16,7 +16,3 @@
   --gn-ui-badge-background-color: var(--color-primary-white);
   --gn-ui-badge-text-color: var(--color-primary-darkest);
 }
-
-:host .metadata-info-keywords ::ng-deep gn-ui-badge:hover {
-  --gn-ui-badge-text-color: white;
-}

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html

@@ -28,11 +28,12 @@
       <gn-ui-max-lines [maxLines]="7">
         <div class="metadata-info-keywords sm:pb-4 flex flex-wrap gap-2">
           @for (keyword of metadata.keywords; track keyword) {
-            <gn-ui-badge
-              class="inline-block lowercase"
-              (click)="onKeywordClick(keyword)"
-              [clickable]="true"
-              >{{ keyword.label }}</gn-ui-badge
+            <gn-ui-button
+              type="primary-light"
+              class="inline-block opacity-70"
+              extraClass="lowercase text-sm py-1 px-2"
+              (buttonClick)="onKeywordClick(keyword)"
+              >{{ keyword.label }}</gn-ui-button
             >
           }
         </div>
@@ -52,7 +53,7 @@
     data-test="usage-panel"
   >
     <div class="flex flex-col gap-[10px] mr-4 py-[12px] rounded text-gray-900">
-      @for (license of licenses; track license) {
+      @for (license of licenses; track $index) {
         @if (license.url) {
           <div class="text-primary">
             <a
@@ -105,9 +106,29 @@
     </div>
   </gn-ui-expandable-panel>
 }
+@if (metadata.contactsForResource?.length) {
+  <gn-ui-expandable-panel
+    [title]="'record.metadata.resource.contacts' | translate"
+    data-test="contacts-panel"
+  >
+    <div class="flex flex-col gap-1 pt-3 pb-4">
+      @for (group of contactGroups; track group.role) {
+        <div class="flex flex-col gap-1 rounded py-4 px-2">
+          <p class="text-xs font-normal text-black">
+            {{ group.roleLabel | translate }}
+          </p>
+          <div class="grid gap-1 grid-cols-1 md:grid-cols-2">
+            @for (contact of group.contacts; track contact.email) {
+              <gn-ui-contact-pill [contact]="contact"></gn-ui-contact-pill>
+            }
+          </div>
+        </div>
+      }
+    </div>
+  </gn-ui-expandable-panel>
+}
 @if (
   (metadata.kind === 'dataset' && metadata.lineage) ||
-  resourceContact ||
   metadata.resourceCreated ||
   metadata.resourcePublished ||
   metadata.resourceUpdated ||
@@ -129,66 +150,6 @@
         </p>
       </div>
     }
-    @if (resourceContact) {
-      <div
-        class="flex flex-row gap-6 mt-5 mb-8 resource-contact"
-        data-test="details-panel-resource-contact"
-      >
-        @if (resourceContact.organization?.logoUrl?.href) {
-          <div
-            class="flex items-center justify-center border-solid border border-gray-300 rounded-md bg-white h-32 overflow-hidden"
-          >
-            <gn-ui-thumbnail
-              class="relative h-full w-full"
-              [thumbnailUrl]="resourceContact.organization.logoUrl.href"
-              fit="contain"
-            ></gn-ui-thumbnail>
-          </div>
-        }
-        <div class="flex flex-col gap-1">
-          <p class="text-sm font-medium" translate>record.metadata.producer</p>
-          <div
-            class="text-primary font-title text-21 mr-2 cursor-pointer hover:underline"
-            data-cy="organization-name"
-          >
-            {{ resourceContact.organization?.name }}
-          </div>
-          @if (resourceContact.organization?.website) {
-            <div>
-              <a
-                [href]="resourceContact.organization.website"
-                target="_blank"
-                class="contact-website text-primary text-sm cursor-pointer hover:underline transition-all"
-                >{{ resourceContact.organization.website }}
-                <ng-icon
-                  class="!w-[12px] !h-[12px] !text-[12px] opacity-75 shrink-0"
-                  name="matOpenInNew"
-                ></ng-icon>
-              </a>
-            </div>
-          }
-          @if (resourceContact.email) {
-            <div class="mt-4">
-              <div class="flex">
-                <ng-icon
-                  class="!w-5 !h-5 !text-[20px] opacity-75 shrink-0"
-                  name="matMailOutline"
-                ></ng-icon>
-                @if (resourceContact.email) {
-                  <a
-                    [href]="'mailto:' + resourceContact.email"
-                    class="text-sm hover:underline ml-2"
-                    target="_blank"
-                    data-cy="contact-email"
-                    >{{ resourceContact?.email }}</a
-                  >
-                }
-              </div>
-            </div>
-          }
-        </div>
-      </div>
-    }
     <div
       class="py-6 px-6 rounded bg-gray-100 grid grid-cols-2 gap-y-6 gap-x-[20px] text-gray-700"
     >

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts

@@ -8,7 +8,10 @@ import {
 } from '@angular/core'
 import {
   CatalogRecord,
+  Individual,
   Keyword,
+  Role,
+  RoleLabels,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { DateService, getTemporalRangeUnion } from '../../../../../../libs/util/shared/src'
 import { MarkdownParserComponent } from '../markdown-parser/markdown-parser.component'
@@ -19,17 +22,18 @@ import {
 import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import {
   BadgeComponent,
+  ButtonComponent,
   CopyTextButtonComponent,
 } from '../../../../../../libs/ui/inputs/src'
 import { ContentGhostComponent } from '../content-ghost/content-ghost.component'
 import { NgIcon, provideIcons } from '@ng-icons/core'
 import { matOpenInNew } from '@ng-icons/material-icons/baseline'
 import { matMailOutline } from '@ng-icons/material-icons/outline'
-import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
 import { GnUiLinkifyDirective } from './linkify.directive'
 import { GnUiHumanizeDateDirective } from '../../../../../../libs/util/shared/src'
 
 import { SpatialExtentComponent } from '../../../../../../libs/ui/map/src'
+import { ContactPillComponent } from '../contact-pill/contact-pill.component'
 
 @Component({
   selector: 'gn-ui-metadata-info',
@@ -42,15 +46,16 @@ import { SpatialExtentComponent } from '../../../../../../libs/ui/map/src'
     TranslatePipe,
     MarkdownParserComponent,
     ExpandablePanelComponent,
+    ButtonComponent,
     BadgeComponent,
     ContentGhostComponent,
-    ThumbnailComponent,
     MaxLinesComponent,
     CopyTextButtonComponent,
     NgIcon,
     GnUiLinkifyDirective,
     GnUiHumanizeDateDirective,
     SpatialExtentComponent,
+    ContactPillComponent,
   ],
   viewProviders: [
     provideIcons({
@@ -132,18 +137,33 @@ export class MetadataInfoComponent {
     return getTemporalRangeUnion(temporalExtents, this.dateService)
   }
 
-  get shownOrganization() {
-    return this.metadata.ownerOrganization
-  }
-
-  get resourceContact() {
-    return this.metadata.contactsForResource?.[0]
-  }
-
   fieldReady(propName: string) {
     return !this.incomplete || propName in this.metadata
   }
 
+  get contactGroups(): {
+    role: Role
+    roleLabel: string
+    contacts: Individual[]
+  }[] {
+    const groups: { role: Role; roleLabel: string; contacts: Individual[] }[] =
+      []
+    const indexByRole = new Map<Role, number>()
+    for (const contact of this.metadata.contactsForResource ?? []) {
+      if (indexByRole.has(contact.role)) {
+        groups[indexByRole.get(contact.role)].contacts.push(contact)
+      } else {
+        indexByRole.set(contact.role, groups.length)
+        groups.push({
+          role: contact.role,
+          roleLabel: RoleLabels.get(contact.role),
+          contacts: [contact],
+        })
+      }
+    }
+    return groups
+  }
+
   onKeywordClick(keyword: Keyword) {
     this.keyword.emit(keyword)
   }

package/src/libs/ui/inputs/src/lib/button/button.component.ts

@@ -25,7 +25,9 @@ export class ButtonComponent {
       | 'outline'
       | 'light'
       | 'gray'
+      | 'gray-light'
       | 'black'
+      | 'primary-light'
   ) {
     // btn-classes are written in full to be picked up by tailwind
     switch (value) {
@@ -44,9 +46,15 @@ export class ButtonComponent {
       case 'gray':
         this.btnClass = 'gn-ui-btn-gray'
         break
+      case 'gray-light':
+        this.btnClass = 'gn-ui-btn-gray-light'
+        break
       case 'black':
         this.btnClass = 'gn-ui-btn-black'
         break
+      case 'primary-light':
+        this.btnClass = 'gn-ui-btn-primary-light'
+        break
       case 'default':
       default:
         this.btnClass = 'gn-ui-btn-default'

package/src/libs/ui/inputs/src/lib/url-input/url-input.component.html

@@ -6,7 +6,7 @@
     type="url"
     [value]="inputValue"
     (input)="handleInput($event)"
-    (keydown.enter)="handleUpload(input)"
+    (keydown.enter)="handleUpload(input, $event)"
     [placeholder]="placeholder"
     [attr.aria-label]="placeholder"
     [disabled]="disabled"
@@ -25,7 +25,7 @@
       extraClass="absolute inset-y-[var(--side-padding)] right-[var(--side-padding)]"
       type="primary"
       [disabled]="disabled || input.value === '' || !isValidUrl(input.value)"
-      (buttonClick)="handleUpload(input)"
+      (buttonClick)="handleUpload(input, $event)"
     >
       <ng-content>
         <ng-icon name="iconoirArrowUp"></ng-icon>

package/src/libs/ui/inputs/src/lib/url-input/url-input.component.ts

@@ -81,7 +81,8 @@ export class UrlInputComponent implements OnChanges {
     this.valueChange.next(value)
   }
 
-  handleUpload(element: HTMLInputElement) {
+  handleUpload(element: HTMLInputElement, event: Event) {
+    event.stopPropagation()
     const value = element.value
     if (!value || !this.isValidUrl(value)) return
     this.uploadClick.next(value)

package/src/libs/ui/map/src/lib/components/map-container/map-container.component.ts

@@ -204,11 +204,12 @@ export class MapContainerComponent implements AfterViewInit, OnChanges {
 
   async ngOnChanges(changes: SimpleChanges) {
     if ('context' in changes && !changes['context'].isFirstChange()) {
+      const olMap = await this.openlayersMap
       const diff = computeMapContextDiff(
         this.processContext(changes['context'].currentValue),
         this.processContext(changes['context'].previousValue)
       )
-      await applyContextDiffToMap(this.olMap, diff)
+      await applyContextDiffToMap(olMap, diff)
 
       if (this._resolvedExtentChange && diff.viewChanges) {
         this._resolvedExtentChange.emit(this.calculateCurrentMapExtent())

package/src/libs/ui/map/src/lib/components/spatial-extent/spatial-extent.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input } from '@angular/core'
+import { ChangeDetectorRef, Component, inject, Input } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { Geometry } from 'geojson'
 import { GeoJSONFeatureCollection } from 'ol/format/GeoJSON.js'
@@ -10,8 +10,8 @@ import {
   MapContextLayer,
 } from '@geospatial-sdk/core'
 import { MapContainerComponent } from '../map-container/map-container.component'
-import { BehaviorSubject, Observable } from 'rxjs'
-import { switchMap } from 'rxjs/operators'
+import { BehaviorSubject, from, Observable, of } from 'rxjs'
+import { map, switchMap, tap } from 'rxjs/operators'
 import { DatasetSpatialExtent } from '../../../../../../../libs/common/domain/src/lib/model/record'
 
 @Component({
@@ -22,14 +22,16 @@ import { DatasetSpatialExtent } from '../../../../../../../libs/common/domain/sr
   styleUrl: './spatial-extent.component.css',
 })
 export class SpatialExtentComponent {
+  private _cdr = inject(ChangeDetectorRef)
+
   @Input() set spatialExtents(value: DatasetSpatialExtent[]) {
     this.spatialExtents$.next(value)
   }
   spatialExtents$ = new BehaviorSubject<DatasetSpatialExtent[]>([])
   mapContext$: Observable<MapContext> = this.spatialExtents$.pipe(
-    switchMap(async (extents) => {
+    switchMap((extents) => {
       if (extents.length === 0) {
-        return null // null extent means default view
+        return of(null)
       }
       const featureCollection: GeoJSONFeatureCollection = {
         type: 'FeatureCollection',
@@ -61,11 +63,10 @@ export class SpatialExtentComponent {
           'fill-color': 'rgba(153, 153, 153, 0.3)',
         },
       }
-      const view = await createViewFromLayer(layer)
-      return {
-        view,
-        layers: [layer],
-      }
+      return from(createViewFromLayer(layer)).pipe(
+        map((view) => ({ view, layers: [layer] }) as MapContext),
+        tap(() => this._cdr.markForCheck())
+      )
     })
   )
 

package/src/libs/ui/search/src/lib/record-preview-row/record-preview-row.component.html

@@ -1,6 +1,5 @@
 <gn-ui-internal-link-card
   [linkHref]="linkHref"
-  [linkTarget]="linkTarget"
   [record]="record"
   [favoriteTemplate]="favoriteTemplate"
   [metadataQualityDisplay]="metadataQualityDisplay"

package/src/libs/util/app-config/src/lib/app-config.ts

@@ -1,6 +1,8 @@
 import * as TOML from '@ltd/j-toml'
 import {
   checkMetadataLanguage,
+  checkNewRecordDefaultLanguage,
+  checkNewRecordStandard,
   parseConfigSection,
   parseMultiConfigSection,
   parseTranslationsConfigSection,
@@ -8,6 +10,7 @@ import {
 import {
   CustomTranslations,
   CustomTranslationsAllLanguages,
+  EditorConfig,
   GlobalConfig,
   LayerConfig,
   MapConfig,
@@ -51,6 +54,12 @@ export function getOptionalSearchConfig(): SearchConfig | null {
   return searchConfig
 }
 
+let editorConfig: EditorConfig = null
+
+export function getOptionalEditorConfig(): EditorConfig | null {
+  return editorConfig
+}
+
 let metadataQualityConfig: MetadataQualityConfig = null
 export function getMetadataQualityConfig(): MetadataQualityConfig {
   return (
@@ -285,6 +294,45 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
               SORTABLE: parsedMetadataQualitySection.sortable,
             } as MetadataQualityConfig)
 
+      let parsedEditingSection = parseConfigSection(
+        parsed,
+        'editing',
+        [],
+        ['new_record_default_language', 'new_record_standard'],
+        warnings,
+        errors
+      )
+      if (
+        parsedEditingSection !== null &&
+        parsedEditingSection.new_record_default_language !== undefined
+      ) {
+        parsedEditingSection = checkNewRecordDefaultLanguage(
+          parsedEditingSection,
+          warnings
+        )
+      }
+      if (
+        parsedEditingSection !== null &&
+        parsedEditingSection.new_record_standard !== undefined
+      ) {
+        parsedEditingSection = checkNewRecordStandard(
+          parsedEditingSection,
+          warnings
+        )
+      }
+      editorConfig =
+        parsedEditingSection === null
+          ? null
+          : ({
+              NEW_RECORD_DEFAULT_LANGUAGE:
+                parsedEditingSection.new_record_default_language as
+                  | string
+                  | undefined,
+              NEW_RECORD_STANDARD: parsedEditingSection.new_record_standard as
+                | EditorConfig['NEW_RECORD_STANDARD']
+                | undefined,
+            } as EditorConfig)
+
       customTranslations = parseTranslationsConfigSection(
         parsed,
         'translations'
@@ -309,6 +357,7 @@ export function isConfigLoaded() {
 export function _reset() {
   globalConfig = null
   themeConfig = null
+  editorConfig = null
   customTranslations = null
 }
 

package/src/libs/util/app-config/src/lib/model.ts

@@ -69,6 +69,13 @@ export interface MetadataQualityConfig {
   ENABLED: boolean
 }
 
+export type NewRecordStandard = 'iso19139' | 'iso19115-3'
+
+export interface EditorConfig {
+  NEW_RECORD_DEFAULT_LANGUAGE?: string
+  NEW_RECORD_STANDARD?: NewRecordStandard
+}
+
 export type CustomTranslations = { [translationKey: string]: string }
 export type CustomTranslationsAllLanguages = {
   [lang: string]: CustomTranslations

package/src/libs/util/app-config/src/lib/parse-utils.ts

@@ -1,4 +1,4 @@
-import { toLang2 } from '../../../../../libs/util/i18n/src'
+import { LANG_2_TO_3_MAPPER, toLang2 } from '../../../../../libs/util/i18n/src'
 
 const flatten = (
   base: string,
@@ -137,3 +137,52 @@ export function checkMetadataLanguage(
   }
   return parsedConfigSection
 }
+
+export function checkNewRecordDefaultLanguage(
+  parsedConfigSection: any,
+  outWarnings: string[]
+) {
+  const lang2 = toLang2(
+    parsedConfigSection.new_record_default_language.toLowerCase()
+  )
+  if (!(lang2 in LANG_2_TO_3_MAPPER)) {
+    outWarnings.push(
+      `In the [editing] section: new_record_default_language = "${parsedConfigSection.new_record_default_language}" is not a recognized ISO 639 language code`
+    )
+    return {
+      ...parsedConfigSection,
+      new_record_default_language: undefined,
+    }
+  }
+  return {
+    ...parsedConfigSection,
+    new_record_default_language: lang2,
+  }
+}
+
+export function checkNewRecordStandard(
+  parsedConfigSection: any,
+  outWarnings: string[]
+) {
+  const standard = parsedConfigSection.new_record_standard
+  const normalizedStandard =
+    typeof standard === 'string' ? standard.trim().toLowerCase() : null
+
+  if (
+    normalizedStandard === 'iso19139' ||
+    normalizedStandard === 'iso19115-3'
+  ) {
+    return {
+      ...parsedConfigSection,
+      new_record_standard: normalizedStandard,
+    }
+  }
+
+  outWarnings.push(
+    `In the [editing] section: new_record_standard = "${standard}" is not a supported metadata standard`
+  )
+  return {
+    ...parsedConfigSection,
+    new_record_standard: undefined,
+  }
+}

package/src/libs/util/shared/src/lib/links/link-utils.ts

@@ -266,7 +266,7 @@ export function checkFileFormat(
       new RegExp(`[./]${format}`, 'i').test(link.name.toLowerCase())) ||
     ('url' in link &&
       new RegExp(`[./]${format}`, 'i').test(link.url.toString())) ||
-    ('name' in link && link.name.toLowerCase().includes(format))
+    ('name' in link && new RegExp(`\\b${format}\\b`, 'i').test(link.name))
   )
 }