geonetwork-ui 2.7.0-dev.f29e01b0d → 2.7.0-dev.fd871c105

package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts

@@ -48,7 +48,7 @@ import {
 import { catchError, map, tap } from 'rxjs/operators'
 import { lt } from 'semver'
 import { ElasticsearchService } from './elasticsearch'
-import { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src'
+import { toLang2 } from '../../../../../../libs/util/i18n/src'
 import { Gn4SettingsService } from './settings/gn4-settings.service'
 
 const minPublicationApiVersion = '4.2.5'
@@ -562,7 +562,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       .pipe(
         map((languages) =>
           languages
-            .map((lang) => getLang2FromLang3(lang.id))
+            .map((lang) => toLang2(lang.id))
             .filter((code): code is string => !!code)
         )
       )

package/src/libs/api/repository/src/lib/gn4/gn4.provider.ts

@@ -4,6 +4,18 @@ import { Gn4PlatformService } from './platform/gn4-platform.service'
 import { Gn4PlatformMapper } from './platform/gn4-platform.mapper'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import { Gn4Repository } from './gn4-repository'
+import { AvatarServiceInterface, GravatarService } from './auth'
+import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
+import {
+  ORGANIZATIONS_STRATEGY,
+  organizationsServiceFactory,
+} from './organizations'
+import { ElasticsearchService } from './elasticsearch'
+import {
+  GroupsApiService,
+  SearchApiService,
+} from '../../../../../../libs/data-access/gn4/src'
+import { TranslateService } from '@ngx-translate/core'
 
 export function provideGn4(): Provider[] {
   return [
@@ -16,5 +28,18 @@ export function provideGn4(): Provider[] {
       useClass: Gn4Repository,
     },
     Gn4PlatformMapper,
+    { provide: AvatarServiceInterface, useClass: GravatarService },
+    {
+      provide: OrganizationsServiceInterface,
+      useFactory: organizationsServiceFactory,
+      deps: [
+        ORGANIZATIONS_STRATEGY,
+        ElasticsearchService,
+        SearchApiService,
+        GroupsApiService,
+        TranslateService,
+        PlatformServiceInterface,
+      ],
+    },
   ]
 }

package/src/libs/api/repository/src/lib/gn4/organizations/index.ts

@@ -1,13 +1,4 @@
 export * from './organizations-from-metadata.service'
 export * from './organizations-from-groups.service'
-
-import { InjectionToken } from '@angular/core'
-
-export type OrganizationsStrategy = 'metadata' | 'groups'
-
-export const ORGANIZATIONS_STRATEGY = new InjectionToken<OrganizationsStrategy>(
-  'organizations-strategy',
-  {
-    factory: () => 'metadata',
-  }
-)
+export * from './organization-strategy.token'
+export * from './organizations-service.factory'

package/src/libs/api/repository/src/lib/gn4/organizations/organization-strategy.token.ts

@@ -0,0 +1,10 @@
+import { InjectionToken } from '@angular/core'
+
+export type OrganizationsStrategy = 'metadata' | 'groups'
+
+export const ORGANIZATIONS_STRATEGY = new InjectionToken<OrganizationsStrategy>(
+  'organizations-strategy',
+  {
+    factory: () => 'metadata',
+  }
+)

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-groups.service.ts

@@ -7,7 +7,7 @@ import {
 import { forkJoin, Observable, of } from 'rxjs'
 import { map, shareReplay } from 'rxjs/operators'
 import { TranslateService } from '@ngx-translate/core'
-import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/model/search'
 import {
   CatalogRecord,
@@ -52,7 +52,7 @@ export class OrganizationsFromGroupsService
   organisationsCount$ = this.organisations$.pipe(map((orgs) => orgs.length))
 
   private get lang3() {
-    return getLang3FromLang2(this.translateService.currentLang)
+    return toLang3(this.translateService.currentLang)
   }
 
   constructor(

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.ts

@@ -33,7 +33,7 @@ import {
   tap,
   withLatestFrom,
 } from 'rxjs/operators'
-import { getLocalizedIndexKey } from '../../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { coerce, satisfies, valid } from 'semver'
 import { TranslateService } from '@ngx-translate/core'
@@ -126,7 +126,7 @@ export class OrganizationsFromMetadataService
   ) {}
 
   private get langIndex() {
-    return getLocalizedIndexKey(this.translateService.currentLang)
+    return `lang${toLang3(this.translateService.currentLang)}`
   }
 
   equalsNormalizedStrings(

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-service.factory.ts

@@ -0,0 +1,33 @@
+import {
+  GroupsApiService,
+  SearchApiService,
+} from '../../../../../../../libs/data-access/gn4/src'
+import { TranslateService } from '@ngx-translate/core'
+import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
+import { ElasticsearchService } from '../elasticsearch'
+import { OrganizationsStrategy } from './organization-strategy.token'
+import { OrganizationsFromGroupsService } from './organizations-from-groups.service'
+import { OrganizationsFromMetadataService } from './organizations-from-metadata.service'
+
+export const organizationsServiceFactory = (
+  strategy: OrganizationsStrategy,
+  esService: ElasticsearchService,
+  searchApiService: SearchApiService,
+  groupsApiService: GroupsApiService,
+  translateService: TranslateService,
+  platformService: PlatformServiceInterface
+) =>
+  strategy === 'groups'
+    ? new OrganizationsFromGroupsService(
+        esService,
+        searchApiService,
+        groupsApiService,
+        translateService
+      )
+    : new OrganizationsFromMetadataService(
+        esService,
+        searchApiService,
+        groupsApiService,
+        platformService,
+        translateService
+      )

package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts

@@ -11,7 +11,6 @@ import {
   MeApiService,
   RecordsApiService,
   RegistriesApiService,
-  SiteApiService,
   ToolsApiService,
   UserfeedbackApiService,
   UsersApiService,
@@ -45,8 +44,8 @@ import {
   throwError,
 } from 'rxjs'
 import { TranslateService } from '@ngx-translate/core'
-import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
-import { DatavizConfigModel } from '../../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
+import { toLang3 } from '../../../../../../../libs/util/i18n/src'
+import { Gn4SettingsService } from '../settings/gn4-settings.service'
 
 const minApiVersion = '4.2.2'
 
@@ -56,6 +55,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
   private readonly me$: Observable<UserModel>
   private readonly users$: Observable<UserModel[]>
   private readonly isUserAnonymous$: Observable<boolean>
+  private readonly gnParseVersion = '4.2.5'
 
   private keyTranslations$ = this.toolsApiService
     .getTranslationsPackage1('gnui')
@@ -66,31 +66,6 @@ export class Gn4PlatformService implements PlatformServiceInterface {
       }),
       shareReplay(1)
     )
-
-  private settings$ = of(true).pipe(
-    switchMap(() => this.siteApiService.getSiteOrPortalDescription()),
-    shareReplay(1)
-  )
-
-  private readonly apiVersion$ = this.settings$.pipe(
-    map((info) => info['system/platform/version'] as string),
-    tap((version) => {
-      if (ltr(version, minApiVersion)) {
-        throw new Error(
-          `Gn4 API version is not compatible.\nMinimum: ${minApiVersion}\nYour version: ${version}`
-        )
-      }
-    }),
-    shareReplay(1)
-  )
-
-  private readonly allowEditHarvestedMd$ = this.settings$.pipe(
-    map((info) => {
-      return info['system/harvester/enableEditing'] as boolean
-    }),
-    shareReplay(1)
-  )
-
   /**
    * A map of already loaded thesauri (groups of keywords); the key is a URI
    * @private
@@ -98,11 +73,10 @@ export class Gn4PlatformService implements PlatformServiceInterface {
   private keywordsByThesauri: Record<string, Observable<Keyword[]>> = {}
 
   private get lang3() {
-    return getLang3FromLang2(this.translateService.currentLang)
+    return toLang3(this.translateService.currentLang)
   }
 
   constructor(
-    private siteApiService: SiteApiService,
     private meApi: MeApiService,
     private usersApi: UsersApiService,
     private mapper: Gn4PlatformMapper,
@@ -111,7 +85,8 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     private translateService: TranslateService,
     private userfeedbackApiService: UserfeedbackApiService,
     private httpClient: HttpClient,
-    private recordsApiService: RecordsApiService
+    private recordsApiService: RecordsApiService,
+    private settingsService: Gn4SettingsService
   ) {
     this.me$ = this.meApi.getMe().pipe(
       switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
@@ -128,16 +103,28 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     )
   }
 
+  getFeedbacksAllowed(): Observable<boolean> {
+    return this.settingsService.allowFeedbacks$
+  }
+
+  getAllowEditHarvestedMd(): Observable<boolean> {
+    return this.settingsService.allowEditHarvested$
+  }
+
   getType(): string {
     return this.type
   }
 
   getApiVersion(): Observable<string> {
-    return this.apiVersion$
-  }
-
-  getAllowEditHarvestedMd(): Observable<boolean> {
-    return this.allowEditHarvestedMd$
+    return this.settingsService.apiVersion$.pipe(
+      tap((version) => {
+        if (ltr(version, minApiVersion)) {
+          throw new Error(
+            `Gn4 API version is not compatible.\nMinimum: ${minApiVersion}\nYour version: ${version}`
+          )
+        }
+      })
+    )
   }
 
   getMe(): Observable<UserModel> {
@@ -390,22 +377,35 @@ export class Gn4PlatformService implements PlatformServiceInterface {
         })
       )
   }
-
   getFileContent(url: URL | string): Observable<any> {
-    return this.httpClient.get(url.toString(), { responseType: 'text' }).pipe(
-      map((text) => {
+    return combineLatest([
+      this.httpClient.get(url.toString(), { responseType: 'text' }),
+      this.getApiVersion(),
+    ]).pipe(
+      map(([text, version]) => {
         const parsed = JSON.parse(text)
 
-        if (typeof parsed === 'object') {
+        if (version > this.gnParseVersion) {
           return parsed
         }
 
-        const decoded = atob(parsed)
+        const decoded = this.decodeBase64(parsed)
         return JSON.parse(decoded)
       })
     )
   }
 
+  decodeBase64(base64) {
+    const text = atob(base64)
+    const length = text.length
+    const bytes = new Uint8Array(length)
+    for (let i = 0; i < length; i++) {
+      bytes[i] = text.charCodeAt(i)
+    }
+    const decoder = new TextDecoder()
+    return decoder.decode(bytes)
+  }
+
   attachFileToRecord(
     recordUuid: string,
     file: File,

package/src/libs/api/repository/src/lib/gn4/settings/gn4-settings.service.ts

@@ -14,6 +14,14 @@ export class Gn4SettingsService {
   public allowEditHarvested$: Observable<boolean> =
     this.getSettingsSetValueByKey('system/harvester/enableEditing')
 
+  public allowFeedbacks$: Observable<boolean> = this.getSettingsSetValueByKey(
+    'system/userFeedback/enable'
+  )
+
+  public apiVersion$: Observable<string> = this.getSettingsSetValueByKey(
+    'system/platform/version'
+  )
+
   constructor(private siteApiService: SiteApiService) {}
 
   private getSettingsSetValueByKey(key: string) {

package/src/libs/api/repository/src/lib/metadata-language.token.ts

@@ -0,0 +1,8 @@
+import { InjectionToken } from '@angular/core'
+import { LanguageCode } from '../../../../../libs/common/domain/src/lib/model/record'
+
+export type LanguageCodeFactory = () => LanguageCode
+
+export const METADATA_LANGUAGE = new InjectionToken<
+  LanguageCode | LanguageCodeFactory
+>('metadata-language')

package/src/libs/common/domain/src/lib/model/record/metadata.model.ts

@@ -69,6 +69,8 @@ marker('domain.record.status.ongoing')
 marker('domain.record.status.under_development')
 marker('domain.record.status.deprecated')
 marker('domain.record.status.removed')
+marker('domain.record.status.planned')
+marker('domain.record.status.required')
 
 export const RecordStatusValues = [
   'completed',
@@ -76,6 +78,8 @@ export const RecordStatusValues = [
   'under_development',
   'deprecated',
   'removed',
+  'planned',
+  'required',
 ]
 export type RecordStatus = (typeof RecordStatusValues)[number]
 
@@ -104,6 +108,11 @@ export interface Keyword {
   translations?: KeywordTranslations
 }
 
+export interface INSPIRE_theme {
+  value: string
+  label: string
+}
+
 export interface BaseRecord {
   uniqueIdentifier: Uuid
   ownerOrganization: Organization
@@ -156,6 +165,17 @@ export type ServiceProtocol =
   | 'maplibre-style'
   | 'other'
 
+marker('record.metadata.api.accessServiceProtocol.wms')
+marker('record.metadata.api.accessServiceProtocol.wfs')
+marker('record.metadata.api.accessServiceProtocol.wps')
+marker('record.metadata.api.accessServiceProtocol.wmts')
+marker('record.metadata.api.accessServiceProtocol.esriRest')
+marker('record.metadata.api.accessServiceProtocol.ogcFeatures')
+marker('record.metadata.api.accessServiceProtocol.GPFDL')
+marker('record.metadata.api.accessServiceProtocol.tms')
+marker('record.metadata.api.accessServiceProtocol.maplibre-style')
+marker('record.metadata.api.accessServiceProtocol.other')
+
 export type OnlineResourceType = 'service' | 'download' | 'link' | 'endpoint'
 
 export interface DatasetServiceDistribution {
@@ -254,7 +274,7 @@ export interface ServiceRecord extends BaseRecord {
 export interface ReuseRecord extends BaseRecord {
   kind: 'reuse'
   lineage: string // Explanation of the origin of this record (e.g: how, why)"
-  onlineResources: Array<OnlineLinkResource>
+  onlineResources: Array<DatasetOnlineResource>
   reuseType: ReuseType
   spatialExtents: Array<DatasetSpatialExtent>
   temporalExtents: Array<DatasetTemporalExtent>

package/src/libs/common/domain/src/lib/platform.service.interface.ts

@@ -57,4 +57,5 @@ export abstract class PlatformServiceInterface {
     removeDuplicate?: boolean
   ): Observable<UploadEvent>
   abstract getFileContent(url: URL): Observable<any>
+  abstract getFeedbacksAllowed(): Observable<boolean>
 }

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

@@ -127,9 +127,6 @@ export const editorFieldSpatialExtentsFixture = () => ({
 export const editorFieldKeywordsFixture = () => ({
   model: 'keywords',
   hidden: false,
-  formFieldConfig: {
-    labelKey: 'editor.record.form.field.keywords',
-  },
 })
 
 export const editorFieldUniqueIdentifierFixture = () => ({

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

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

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

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

package/src/libs/feature/catalog/src/lib/site-title/site-title.component.ts

@@ -1,8 +1,10 @@
+import { CommonModule } from '@angular/common'
 import { ChangeDetectionStrategy, Component } from '@angular/core'
 import {
   SettingsListResponseApiModel,
   SiteApiService,
 } from '../../../../../../libs/data-access/gn4/src'
+import { CatalogTitleComponent } from '../../../../../../libs/ui/catalog/src'
 import { Observable } from 'rxjs'
 import { shareReplay } from 'rxjs/operators'
 
@@ -11,6 +13,8 @@ import { shareReplay } from 'rxjs/operators'
   templateUrl: './site-title.component.html',
   styleUrls: ['./site-title.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, CatalogTitleComponent],
 })
 export class SiteTitleComponent {
   info$: Observable<SettingsListResponseApiModel>

package/src/libs/feature/catalog/src/lib/source-label/source-label.component.ts

@@ -1,12 +1,15 @@
 import { Component, ChangeDetectionStrategy, Input } from '@angular/core'
 import { Observable } from 'rxjs'
 import { SourcesService } from '../sources/sources.service'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-source-label',
   templateUrl: './source-label.component.html',
   styleUrls: ['./source-label.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule],
 })
 export class SourceLabelComponent {
   sourceLabel$: Observable<string>

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

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs'
 import { filter, map, shareReplay } from 'rxjs/operators'
 import { CatalogSource } from './sources.model'
 import { TranslateService } from '@ngx-translate/core'
-import { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src'
+import { toLang3 } from '../../../../../../libs/util/i18n/src'
 
 @Injectable({
   providedIn: 'root',
@@ -23,10 +23,7 @@ export class SourcesService {
     return this.sources$.pipe(
       map((sources) => sources.filter((source) => source.uuid === uuid)[0]),
       filter((source) => !!source),
-      map(
-        (source) =>
-          source.label[getLang3FromLang2(this.translateService.currentLang)]
-      )
+      map((source) => source.label[toLang3(this.translateService.currentLang)])
     )
   }
 }

package/src/libs/feature/dataviz/src/lib/service/data.service.ts

@@ -237,7 +237,9 @@ export class DataService {
     tmsLink: DatasetServiceDistribution,
     keepOriginalLink = false
   ): Promise<DatasetServiceDistribution[]> {
-    const endpoint = new TmsEndpoint(tmsLink.url.toString())
+    const endpoint = new TmsEndpoint(
+      tmsLink.url.toString().replace(/\/?$/, `/${tmsLink.name}`)
+    )
     const tileMaps = await endpoint.allTileMaps.catch(() => {
       throw new Error(`ogc.unreachable.unknown`)
     })

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

@@ -9,3 +9,4 @@ export * from './lib/components/import-record/import-record.component'
 export * from './lib/components/record-form/record-form.component'
 export * from './lib/components/record-form/form-field'
 export * from './lib/components/multilingual-panel/multilingual-panel.component'
+export * from './lib/components/metadata-quality-panel/metadata-quality-panel.component'

package/src/libs/feature/editor/src/lib/+state/editor.effects.ts

@@ -11,14 +11,14 @@ import {
   selectRecordSource,
 } from './editor.selectors'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
-import { Gn4PlatformService } from '../../../../../../libs/api/repository/src'
+import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
 
 @Injectable()
 export class EditorEffects {
   private actions$ = inject(Actions)
   private editorService = inject(EditorService)
   private recordsRepository = inject(RecordsRepositoryInterface)
-  private gn4PlateformService = inject(Gn4PlatformService)
+  private plateformService = inject(PlatformServiceInterface)
   private store = inject(Store)
 
   saveRecord$ = createEffect(() =>
@@ -64,7 +64,7 @@ export class EditorEffects {
         withLatestFrom(this.store.select(selectRecord)),
         switchMap(([_, record]) => {
           if (record.uniqueIdentifier !== null) {
-            this.gn4PlateformService.cleanRecordAttachments(record).subscribe({
+            this.plateformService.cleanRecordAttachments(record).subscribe({
               next: (_) => undefined,
               error: (err) => {
                 console.error(err)

package/src/libs/feature/editor/src/lib/components/generic-keywords/generic-keywords.component.ts

@@ -12,7 +12,11 @@ import { map } from 'rxjs'
 import { Keyword } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
 import { TranslatePipe } from '@ngx-translate/core'
-import { NgIconComponent, provideIcons } from '@ng-icons/core'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
 import { matWarningAmberOutline } from '@ng-icons/material-icons/outline'
 
 type AutocompleteItem = { title: string; value: Keyword }
@@ -34,6 +38,9 @@ type AutocompleteItem = { title: string; value: Keyword }
     provideIcons({
       matWarningAmberOutline,
     }),
+    provideNgIconsConfig({
+      size: '1.5em',
+    }),
   ],
 })
 export class GenericKeywordsComponent {

package/src/libs/feature/editor/src/lib/components/metadata-quality-panel/metadata-quality-panel.component.html

@@ -0,0 +1,37 @@
+<div
+  class="flex flex-col h-full w-[302px] border-l border-gray-300 py-8 px-3 gap-3 overflow-auto"
+  style="background-color: #fafaf9"
+>
+  <div class="flex flex-row px-2 justify-between">
+    <span class="text-3xl font-title text-black/80" translate
+      >editor.record.form.metadataQuality.title</span
+    >
+  </div>
+  <div
+    *ngFor="let properties of propertiesByPage; let i = index"
+    class="flex flex-col gap-2"
+  >
+    <gn-ui-button
+      *ngFor="let property of properties"
+      [extraClass]="getExtraClass(property.value)"
+      type="outline"
+      attr.data-cy="md-quality-btn-{{ property.label }}"
+    >
+      <span>{{ property.label | translate }}</span>
+      <div class="flex flex-row gap-2 items-center">
+        <ng-icon
+          *ngIf="property.value; else notChecked"
+          class="text-primary"
+          name="iconoirBadgeCheck"
+        ></ng-icon>
+        <ng-template #notChecked>
+          <ng-icon class="text-neutral-300" name="iconoirSystemShut"></ng-icon>
+        </ng-template>
+      </div>
+    </gn-ui-button>
+    <hr
+      *ngIf="i !== propertiesByPage.length - 1"
+      class="border-gray-300 w-11/12 mx-auto"
+    />
+  </div>
+</div>