geonetwork-ui 2.10.0-dev.de2fa8e42 → 2.10.0-dev.e2dc4fd62

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

@@ -128,7 +128,7 @@ export class OrganizationsFromMetadataService
   ) {}
 
   private get langIndex() {
-    return `lang${toLang3(this.translateService.currentLang)}`
+    return `lang${toLang3(this.translateService.getCurrentLang())}`
   }
 
   equalsNormalizedStrings(

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

@@ -1,5 +1,5 @@
 import { HttpClient, HttpEventType } from '@angular/common/http'
-import { Injectable, InjectionToken, inject } from '@angular/core'
+import { inject, Injectable, InjectionToken } from '@angular/core'
 import {
   KeywordApiResponse,
   ThesaurusApiResponse,
@@ -12,11 +12,13 @@ import {
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
 import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
+import { GroupModel } from '../../../../../../../libs/common/domain/src/lib/model/user/group.model'
 import {
   PlatformServiceInterface,
   UploadEvent,
 } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import {
+  GroupsApiService,
   MeApiService,
   RecordsApiService,
   RegistriesApiService,
@@ -57,6 +59,7 @@ export const DISABLE_AUTH = new InjectionToken<boolean>('gnDisableAuth', {
 export class Gn4PlatformService implements PlatformServiceInterface {
   private meApi = inject(MeApiService)
   private usersApi = inject(UsersApiService)
+  private groupsApi = inject(GroupsApiService)
   private mapper = inject(Gn4PlatformMapper)
   private toolsApiService = inject(ToolsApiService)
   private registriesApiService = inject(RegistriesApiService)
@@ -97,7 +100,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
   private keywordsByThesauri: Record<string, Observable<Keyword[]>> = {}
 
   private get lang3() {
-    return toLang3(this.translateService.currentLang)
+    return toLang3(this.translateService.getCurrentLang())
   }
 
   constructor() {
@@ -155,6 +158,49 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     return this.users$
   }
 
+  getUserPermissionsByGroup(): Observable<GroupModel[]> {
+    if (this.disableAuth) return of([])
+    return combineLatest([this.meApi.getMe(), this.groupsApi.getGroups()]).pipe(
+      map(([meResponse, groups]) => {
+        if (!meResponse) return []
+        if (meResponse.admin) {
+          return groups.map((group) => ({
+            groupId: group.id,
+            groupName: group.name,
+            isMember: true,
+            canEdit: true,
+            canApprove: true,
+            canAdministrate: true,
+          }))
+        }
+        const reviewerIds = meResponse.groupsWithReviewer ?? []
+        const editorIds = meResponse.groupsWithEditor ?? []
+        const memberIds = meResponse.groupsWithRegisteredUser ?? []
+        const adminIds = meResponse.groupsWithUserAdmin ?? []
+        const groupsById = new Map(groups.map((g) => [g.id, g]))
+        return [
+          ...new Set([
+            ...reviewerIds,
+            ...editorIds,
+            ...groups.map((g) => g.id),
+          ]),
+        ]
+          .filter((id) => groupsById.has(id))
+          .map((id) => {
+            const group = groupsById.get(id)
+            return {
+              groupId: group.id,
+              groupName: group.name,
+              isMember: memberIds.includes(id),
+              canEdit: editorIds.includes(id),
+              canApprove: reviewerIds.includes(id),
+              canAdministrate: adminIds.includes(id),
+            }
+          })
+      })
+    )
+  }
+
   translateKey(key: string): Observable<string> {
     // if the key is a URI, use the registries API to look for the translation
     if (key.match(/^https?:\/\//)) {

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

@@ -104,15 +104,12 @@ export interface Keyword {
   type: KeywordType
   thesaurus?: ThesaurusModel
   bbox?: [number, number, number, number]
+  // thesaurus hierarchy path incl. the keyword as last element; unset for root-level keywords
+  hierarchyPath?: string[]
 
   translations?: KeywordTranslations
 }
 
-export interface INSPIRE_topic {
-  value: string
-  label: string
-}
-
 export interface ResourceIdentifier {
   code: string
   codeSpace?: string
@@ -254,10 +251,20 @@ export interface DatasetTemporalExtent {
   end?: Date
 }
 
+/**
+ * Represents a source dataset referenced from a lineage entry.
+ */
+export interface SourceRecord {
+  uuid?: string
+  title?: string
+  href?: string
+}
+
 export interface DatasetRecord extends BaseRecord {
   kind: 'dataset'
   status: RecordStatus
   lineage: string // Explanation of the origin of this record (e.g: how, why)"
+  sourceRecords: Array<SourceRecord>
   onlineResources: Array<DatasetOnlineResource>
   spatialExtents: Array<DatasetSpatialExtent>
   temporalExtents: Array<DatasetTemporalExtent>
@@ -285,6 +292,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)"
+  sourceRecords: Array<SourceRecord>
   onlineResources: Array<DatasetOnlineResource>
   reuseType: ReuseType
   spatialExtents: Array<DatasetSpatialExtent>

package/src/libs/common/domain/src/lib/model/thesaurus/thesaurus.model.ts

@@ -1,7 +1,8 @@
 export type KeywordType = 'place' | 'temporal' | 'theme' | 'other'
 
 export interface ThesaurusModel {
-  id: string
+  // absent when the source provides no identifier for the thesaurus
+  id?: string
   name?: string
   url?: URL
   thesaurusKey?: string

package/src/libs/common/domain/src/lib/model/user/group.model.ts

@@ -0,0 +1,8 @@
+export interface GroupModel {
+  groupId: number
+  groupName: string
+  isMember: boolean
+  canEdit: boolean
+  canApprove: boolean
+  canAdministrate: boolean
+}

package/src/libs/common/domain/src/lib/model/user/index.ts

@@ -1 +1,2 @@
 export * from './user.model'
+export * from './group.model'

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

@@ -1,5 +1,6 @@
 import type { Observable } from 'rxjs'
 import type { UserModel } from './model/user/user.model'
+import type { GroupModel } from './model/user/group.model'
 import type { Organization } from './model/record/organization.model'
 import { CatalogRecord, Keyword, UserFeedback } from './model/record'
 import { KeywordType } from './model/thesaurus'
@@ -28,6 +29,7 @@ export abstract class PlatformServiceInterface {
   abstract getMe(): Observable<UserModel>
   abstract isAnonymous(): Observable<boolean>
   abstract getUsers(): Observable<UserModel[]>
+  abstract getUserPermissionsByGroup(): Observable<GroupModel[]>
   abstract getUsersByOrganization(
     organisation: Organization
   ): Observable<UserModel[]>

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

@@ -134,6 +134,7 @@ 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.**`,
+    sourceRecords: [],
     licenses: [
       {
         text: 'Licence ODbL mai 2013 (basée sur ODbL 1.0)',
@@ -310,6 +311,7 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
     ],
     lineage: `Document d’urbanisme numérisé conformément aux prescriptions nationales du CNIG par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.
 Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur de 2019 et contrôlé par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.`,
+    sourceRecords: [],
     legalConstraints: [],
     securityConstraints: [],
     otherConstraints: [],
@@ -361,6 +363,7 @@ export const simpleDatasetRecordFixture = (): DatasetRecord => ({
   overviews: [],
   spatialExtents: [],
   temporalExtents: [],
+  sourceRecords: [],
   onlineResources: [
     {
       type: 'download',
@@ -413,6 +416,7 @@ export const simpleDatasetRecordWithFcatsFixture = (): DatasetRecord => ({
   overviews: [],
   spatialExtents: [],
   temporalExtents: [],
+  sourceRecords: [],
   onlineResources: [],
   updateFrequency: { per: 'month', updatedTimes: 3 },
   translations: {},
@@ -978,6 +982,7 @@ export const multilingualDatasetFixture: () => DatasetRecord = () => ({
   title: 'English Title',
   abstract: 'English Abstract',
   lineage: 'English Lineage',
+  sourceRecords: [],
   translations: {
     title: { fr: 'Titre Français', de: 'Titel DE' },
     abstract: { fr: 'Résumé Français', de: 'Beschreibung DE' },

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

@@ -1,4 +1,4 @@
-import { Injectable, inject } from '@angular/core'
+import { inject, Injectable } from '@angular/core'
 import { SourcesApiService } from '../../../../../../libs/data-access/gn4/src'
 import { Observable } from 'rxjs'
 import { filter, map, shareReplay } from 'rxjs/operators'
@@ -21,7 +21,10 @@ export class SourcesService {
     return this.sources$.pipe(
       map((sources) => sources.filter((source) => source.uuid === uuid)[0]),
       filter((source) => !!source),
-      map((source) => source.label[toLang3(this.translateService.currentLang)])
+      map(
+        (source) =>
+          source.label[toLang3(this.translateService.getCurrentLang())]
+      )
     )
   }
 }

package/src/libs/feature/editor/src/lib/components/constraint-card/constraint-card.component.ts

@@ -8,7 +8,6 @@ import {
 
 import { FormFieldRichComponent } from '../record-form/form-field/form-field-rich/form-field-rich.component'
 import { ButtonComponent, UrlInputComponent } from '../../../../../../../libs/ui/inputs/src'
-import { MatIconModule } from '@angular/material/icon'
 import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { Constraint } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import {
@@ -26,7 +25,6 @@ import { marker } from '@biesbjerg/ngx-translate-extract-marker'
     FormFieldRichComponent,
     UrlInputComponent,
     ButtonComponent,
-    MatIconModule,
     TranslateDirective,
     TranslatePipe,
     NgIconComponent,

package/src/libs/feature/editor/src/lib/components/record-form/form-field/field-focus.directive.ts

@@ -10,7 +10,7 @@ export class FieldFocusDirective {
 
   private el = inject(ElementRef)
 
-  public focusField() {
+  public focusField(focusInnerTarget = true) {
     setTimeout(() => {
       const host = this.el.nativeElement as HTMLElement
       const glowClass = this.gnUiFieldFocusGlowClass
@@ -25,6 +25,9 @@ export class FieldFocusDirective {
       )
 
       host.scrollIntoView({ behavior: 'smooth', block: 'start' })
+      if (!focusInnerTarget) {
+        return
+      }
       const target =
         host.querySelector<HTMLElement>(
           'input, textarea, select, [contenteditable="true"]'

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-constraints-shortcuts/form-field-constraints-shortcuts.component.ts

@@ -131,13 +131,12 @@ export class FormFieldConstraintsShortcutsComponent implements OnDestroy {
           map((c) => c.length > 0),
           distinctUntilChanged()
         )
-        combineLatest([
-          isConstraintNotEmpty$,
-          this.anyToggleActivated$,
-        ]).subscribe(([isNotEmpty, anyToggleActivated]) => {
-          const visible = isNotEmpty && !anyToggleActivated
-          this.editorFacade.setFieldVisibility({ model }, visible)
-        })
+        combineLatest([isConstraintNotEmpty$, this.anyToggleActivated$])
+          .pipe(takeUntil(this.onDestroy$))
+          .subscribe(([isNotEmpty, anyToggleActivated]) => {
+            const visible = isNotEmpty && !anyToggleActivated
+            this.editorFacade.setFieldVisibility({ model }, visible)
+          })
       }
       hideEmptyConstraints(this.securityConstraints$, 'securityConstraints')
       hideEmptyConstraints(this.otherConstraints$, 'otherConstraints')

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-topics/form-field-topics.component.ts

@@ -5,7 +5,7 @@ import {
   DropdownMultiselectComponent,
 } from '../../../../../../../../../libs/ui/inputs/src'
 import { TranslatePipe, TranslateService } from '@ngx-translate/core'
-import { INSPIRE_TOPICS } from '../../../../fields.config'
+import { ISO_TOPICS } from '../../../../fields.config'
 
 @Component({
   selector: 'gn-ui-form-field-topics',
@@ -22,7 +22,7 @@ export class FormFieldTopicsComponent {
     this.topics = topics
   }
   @Output() valueChange: EventEmitter<string[]> = new EventEmitter()
-  availableTopics = INSPIRE_TOPICS.map((topic) => {
+  availableTopics = ISO_TOPICS.map((topic) => {
     return {
       label: this.translateService.instant(topic.label),
       value: topic.value,

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.css

@@ -1,37 +1,3 @@
 :host {
   scroll-margin-top: 90px;
 }
-
-:host.gn-ui-field-focus-glow {
-  position: relative;
-}
-
-:host.gn-ui-field-focus-glow::after {
-  content: '';
-  position: absolute;
-  inset: -8px;
-  border-radius: 8px;
-  background-color: color-mix(in srgb, var(--color-primary) 12%, transparent);
-  pointer-events: none;
-  animation: gn-ui-field-focus-glow 3s ease-out forwards;
-}
-
-:host.gn-ui-field-focus-glow::before {
-  content: '';
-  position: absolute;
-  inset: -16px;
-  border: 2px dashed var(--color-primary);
-  border-radius: 10px;
-  pointer-events: none;
-  animation: gn-ui-field-focus-glow 3s ease-out forwards;
-}
-
-@keyframes gn-ui-field-focus-glow {
-  0%,
-  55% {
-    opacity: 1;
-  }
-  100% {
-    opacity: 0;
-  }
-}

package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.css

@@ -0,0 +1,35 @@
+/* Glow applied by FieldFocusDirective (gnUiFieldFocus) to a focused field or,
+   when the field is hidden, to its whole section. */
+.gn-ui-field-focus-glow {
+  position: relative;
+}
+
+.gn-ui-field-focus-glow::after {
+  content: '';
+  position: absolute;
+  inset: -8px;
+  border-radius: 8px;
+  background-color: color-mix(in srgb, var(--color-primary) 12%, transparent);
+  pointer-events: none;
+  animation: gn-ui-field-focus-glow 3s ease-out forwards;
+}
+
+.gn-ui-field-focus-glow::before {
+  content: '';
+  position: absolute;
+  inset: -16px;
+  border: 2px dashed var(--color-primary);
+  border-radius: 10px;
+  pointer-events: none;
+  animation: gn-ui-field-focus-glow 3s ease-out forwards;
+}
+
+@keyframes gn-ui-field-focus-glow {
+  0%,
+  55% {
+    opacity: 1;
+  }
+  100% {
+    opacity: 0;
+  }
+}

package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.html

@@ -4,7 +4,11 @@
     track sectionTracker($index, section)
   ) {
     @if (!section.hidden) {
-      <div class="flex flex-col gap-6 border p-8 rounded-[8px] shadow">
+      <div
+        class="flex flex-col gap-6 border p-8 rounded-[8px] shadow scroll-mt-[90px]"
+        gnUiFieldFocus
+        #sectionFocus="fieldFocus"
+      >
         <div class="flex flex-col gap-2">
           @if (section.labelKey) {
             <div class="text-2xl font-title text-black" translate>

package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.ts

@@ -9,7 +9,7 @@ import {
 } from '@angular/core'
 import { EditorFacade } from '../../+state/editor.facade'
 import { EditorFieldValue } from '../../models'
-import { FormFieldComponent } from './form-field'
+import { FieldFocusDirective, FormFieldComponent } from './form-field'
 import { TranslateDirective } from '@ngx-translate/core'
 import {
   EditorFieldWithValue,
@@ -25,7 +25,12 @@ import { switchMap } from 'rxjs/operators'
   styleUrls: ['./record-form.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, FormFieldComponent, TranslateDirective],
+  imports: [
+    CommonModule,
+    FormFieldComponent,
+    FieldFocusDirective,
+    TranslateDirective,
+  ],
 })
 export class RecordFormComponent implements OnInit, OnDestroy {
   facade = inject(EditorFacade)
@@ -36,17 +41,22 @@ export class RecordFormComponent implements OnInit, OnDestroy {
   )
 
   focusFieldWithPage$ = this.facade.focusedField$.pipe(
-    switchMap(
-      async (field) => [field, await this.getPageIndexForField(field)] as const
-    )
+    switchMap(async (field) => {
+      const location = await this.getFieldLocation(field)
+      return [field, location?.page ?? null, location?.section ?? -1] as const
+    })
   )
 
   formFields = viewChildren(FormFieldComponent)
+  sectionFocusDirectives = viewChildren<FieldFocusDirective>('sectionFocus')
 
-  focusField(model: CatalogRecordKeys) {
-    const fields = this.formFields()
-    const field = fields.find((f) => f.model === model)
-    field?.fieldFocus.focusField()
+  focusField(model: CatalogRecordKeys, sectionIndex: number) {
+    const field = this.formFields().find((f) => f.model === model)
+    if (field) {
+      field.fieldFocus.focusField()
+      return
+    }
+    this.sectionFocusDirectives()[sectionIndex]?.focusField(false)
   }
 
   ngOnInit() {
@@ -55,15 +65,15 @@ export class RecordFormComponent implements OnInit, OnDestroy {
         .pipe(
           withLatestFrom(
             this.facade.currentPage$,
-            ([field, fieldPage], currentPage) =>
-              [field, fieldPage, currentPage] as const
+            ([field, fieldPage, fieldSection], currentPage) =>
+              [field, fieldPage, fieldSection, currentPage] as const
           )
         )
-        .subscribe(([field, fieldPage, currentPage]) => {
+        .subscribe(([field, fieldPage, fieldSection, currentPage]) => {
           if (fieldPage !== null && fieldPage !== currentPage) {
             this.facade.setCurrentPage(fieldPage)
           }
-          setTimeout(() => this.focusField(field))
+          setTimeout(() => this.focusField(field, fieldSection))
         })
     )
   }
@@ -87,13 +97,19 @@ export class RecordFormComponent implements OnInit, OnDestroy {
     return section.labelKey
   }
 
-  async getPageIndexForField(model: CatalogRecordKeys): Promise<number | null> {
+  async getFieldLocation(
+    model: CatalogRecordKeys
+  ): Promise<{ page: number; section: number } | null> {
     const config = await firstValueFrom(this.facade.editorConfig$)
-    const pageIndex = config.pages.findIndex((page) =>
-      page.sections.some((section) =>
-        section.fields.some((field) => field.model === model)
-      )
+    const page = config.pages.findIndex((p) =>
+      p.sections.some((s) => s.fields.some((f) => f.model === model))
     )
-    return pageIndex >= 0 ? pageIndex : null
+    if (page < 0) {
+      return null
+    }
+    const section = config.pages[page].sections
+      .filter((s) => !s.hidden)
+      .findIndex((s) => s.fields.some((f) => f.model === model))
+    return { page, section }
   }
 }

package/src/libs/feature/editor/src/lib/fields.config.ts

@@ -4,10 +4,12 @@ import {
   EditorField,
   EditorSection,
 } from './models/editor-config.model'
-import {
-  INSPIRE_topic,
-  Keyword,
-} from '../../../../../libs/common/domain/src/lib/model/record'
+import { Keyword } from '../../../../../libs/common/domain/src/lib/model/record'
+
+export interface ISOTopic {
+  value: string
+  label: string
+}
 
 /**
  * This file contains the configuration of the fields that will be displayed in the editor.
@@ -359,75 +361,86 @@ export const SPATIAL_SCOPES: Keyword[] = [
 ]
 
 /************************************************************
- ***************           INSPIRE TOPICS            **************
+ ***************             ISO TOPICS             **************
  ************************************************************
  */
 
-export const INSPIRE_TOPICS: INSPIRE_topic[] = [
-  { value: 'biota', label: 'editor.record.form.topics.inspire.biota' },
+// label keys mirror the ISO MD_TopicCategoryCode value for consistency
+// TODO: correctly handle code lists; for instance, this code list is specific to ISO 19139
+export const ISO_TOPICS: ISOTopic[] = [
+  { value: 'biota', label: marker('editor.record.form.topics.iso.biota') },
   {
     value: 'boundaries',
-    label: 'editor.record.form.topics.inspire.boundaries',
+    label: marker('editor.record.form.topics.iso.boundaries'),
   },
   {
     value: 'climatologyMeteorologyAtmosphere',
-    label: 'editor.record.form.topics.inspire.climatology',
+    label: marker(
+      'editor.record.form.topics.iso.climatologyMeteorologyAtmosphere'
+    ),
+  },
+  {
+    value: 'economy',
+    label: marker('editor.record.form.topics.iso.economy'),
+  },
+  {
+    value: 'elevation',
+    label: marker('editor.record.form.topics.iso.elevation'),
   },
-  { value: 'economy', label: 'editor.record.form.topics.inspire.economy' },
-  { value: 'elevation', label: 'editor.record.form.topics.inspire.elevation' },
   {
     value: 'environment',
-    label: 'editor.record.form.topics.inspire.environnement',
+    label: marker('editor.record.form.topics.iso.environment'),
+  },
+  {
+    value: 'farming',
+    label: marker('editor.record.form.topics.iso.farming'),
+  },
+  {
+    value: 'geoscientificInformation',
+    label: marker('editor.record.form.topics.iso.geoscientificInformation'),
   },
-  { value: 'farming', label: 'editor.record.form.topics.inspire.farming' },
   {
-    value: 'geoscientific information',
-    label: 'editor.record.form.topics.inspire.geoscientific',
+    value: 'health',
+    label: marker('editor.record.form.topics.iso.health'),
   },
-  { value: 'health', label: 'editor.record.form.topics.inspire.health' },
   {
     value: 'imageryBaseMapsEarthCover',
-    label: 'editor.record.form.topics.inspire.imagery',
+    label: marker('editor.record.form.topics.iso.imageryBaseMapsEarthCover'),
+  },
+  {
+    value: 'inlandWaters',
+    label: marker('editor.record.form.topics.iso.inlandWaters'),
   },
-  { value: 'inlandWaters', label: 'editor.record.form.topics.inspire.waters' },
   {
     value: 'intelligenceMilitary',
-    label: 'editor.record.form.topics.inspire.intelligence',
+    label: marker('editor.record.form.topics.iso.intelligenceMilitary'),
+  },
+  {
+    value: 'location',
+    label: marker('editor.record.form.topics.iso.location'),
+  },
+  {
+    value: 'oceans',
+    label: marker('editor.record.form.topics.iso.oceans'),
   },
-  { value: 'Location', label: 'editor.record.form.topics.inspire.location' },
-  { value: 'Oceans', label: 'editor.record.form.topics.inspire.oceans' },
   {
     value: 'planningCadastre',
-    label: 'editor.record.form.topics.inspire.planning',
+    label: marker('editor.record.form.topics.iso.planningCadastre'),
   },
-  { value: 'Society', label: 'editor.record.form.topics.inspire.society' },
-  { value: 'Structure', label: 'editor.record.form.topics.inspire.structure' },
   {
-    value: 'Transportation',
-    label: 'editor.record.form.topics.inspire.transportation',
+    value: 'society',
+    label: marker('editor.record.form.topics.iso.society'),
+  },
+  {
+    value: 'structure',
+    label: marker('editor.record.form.topics.iso.structure'),
+  },
+  {
+    value: 'transportation',
+    label: marker('editor.record.form.topics.iso.transportation'),
   },
   {
     value: 'utilitiesCommunication',
-    label: 'editor.record.form.topics.inspire.utilities',
+    label: marker('editor.record.form.topics.iso.utilitiesCommunication'),
   },
 ]
-
-marker('editor.record.form.topics.inspire.biota')
-marker('editor.record.form.topics.inspire.boundaries')
-marker('editor.record.form.topics.inspire.climatology')
-marker('editor.record.form.topics.inspire.economy')
-marker('editor.record.form.topics.inspire.elevation')
-marker('editor.record.form.topics.inspire.environnement')
-marker('editor.record.form.topics.inspire.farming')
-marker('editor.record.form.topics.inspire.geoscientific')
-marker('editor.record.form.topics.inspire.health')
-marker('editor.record.form.topics.inspire.imagery')
-marker('editor.record.form.topics.inspire.intelligence')
-marker('editor.record.form.topics.inspire.location')
-marker('editor.record.form.topics.inspire.oceans')
-marker('editor.record.form.topics.inspire.planning')
-marker('editor.record.form.topics.inspire.society')
-marker('editor.record.form.topics.inspire.structure')
-marker('editor.record.form.topics.inspire.transportation')
-marker('editor.record.form.topics.inspire.utilities')
-marker('editor.record.form.topics.inspire.waters')

package/src/libs/feature/editor/src/lib/services/editor.service.ts

@@ -1,5 +1,5 @@
 import { Injectable, inject } from '@angular/core'
-import { forkJoin, Observable, of, switchMap } from 'rxjs'
+import { Observable, switchMap } from 'rxjs'
 import { map, tap } from 'rxjs/operators'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { EditorConfig } from '../models/'