geonetwork-ui 2.11.0-dev.7f3cfba04 → 2.11.0-dev.840dcc932

package/src/libs/api/metadata-converter/src/lib/iso19115-3/read-parts.ts

@@ -36,7 +36,7 @@ import {
   AssociatedRecord,
   DatasetFeatureAttribute,
   DatasetFeatureAttributeValue,
-  DatasetFeatureCatalog,
+  DatasetFeatureType,
   Individual,
   LanguageCode,
   SourceRecord,
@@ -428,11 +428,13 @@ function extractListedValue(): ChainableFunction<
   return pipe(
     combine(
       pipe(findChildElement('gfc:code', false), extractCharacterString()),
-      pipe(findChildElement('gfc:label', false), extractCharacterString())
+      pipe(findChildElement('gfc:label', false), extractCharacterString()),
+      pipe(findChildElement('gfc:definition', false), extractCharacterString())
     ),
-    map(([code, label]) => ({
-      ...(code && { code }),
+    map(([code, label, description]) => ({
+      value: code ?? '',
       ...(label && { label }),
+      ...(description && { description }),
     }))
   )
 }
@@ -447,6 +449,10 @@ function extractFeatureAttribute(): ChainableFunction<
         findChildElement('gfc:memberName', false),
         extractCharacterStringOrText()
       ),
+      pipe(
+        findChildElement('gfc:designation', false),
+        extractCharacterString()
+      ),
       pipe(findChildElement('gfc:definition', false), extractCharacterString()),
       pipe(findChildElement('gfc:code', false), extractCharacterString()),
       pipe(
@@ -456,11 +462,12 @@ function extractFeatureAttribute(): ChainableFunction<
       pipe(
         findNestedElements('gfc:listedValue', 'gfc:FC_ListedValue'),
         mapArray(extractListedValue()),
-        filterArray((value) => !!(value.code || value.label))
+        filterArray((value) => !!(value.value || value.label))
       )
     ),
-    map(([name, description, code, type, values]) => ({
+    map(([name, label, description, code, type, values]) => ({
       name: name ?? '',
+      ...(label && { label }),
       ...(description && { description }),
       ...(code && { code }),
       ...(type && { type }),
@@ -471,7 +478,7 @@ function extractFeatureAttribute(): ChainableFunction<
 
 export function readFeatureTypeDescriptions(
   rootEl: XmlElement
-): DatasetFeatureCatalog['featureTypes'] {
+): Array<DatasetFeatureType> {
   return pipe(
     findNestedElements(
       'mdb:contentInfo',
@@ -488,6 +495,10 @@ export function readFeatureTypeDescriptions(
             findChildElement('gfc:typeName', false),
             extractCharacterStringOrText()
           ),
+          pipe(
+            findChildElement('gfc:designation', false),
+            extractCharacterString()
+          ),
           pipe(
             findChildElement('gfc:definition', false),
             extractCharacterString()
@@ -500,8 +511,9 @@ export function readFeatureTypeDescriptions(
             mapArray(extractFeatureAttribute())
           )
         ),
-        map(([name, description, attributes]) => ({
+        map(([name, label, description, attributes]) => ({
           name: name ?? '',
+          ...(label && { label }),
           ...(description && { description }),
           attributes,
         }))

package/src/libs/api/metadata-converter/src/lib/iso19115-3/write-parts.ts

@@ -1,5 +1,8 @@
 import {
   CatalogRecord,
+  DatasetFeatureAttribute,
+  DatasetFeatureAttributeValue,
+  DatasetFeatureType,
   DatasetRecord,
   Individual,
   LanguageCode,
@@ -616,3 +619,131 @@ export function writeAssociatedRecords(
     )
   )(rootEl)
 }
+
+function createNilElement(name: string, nilReason: string) {
+  return pipe(createElement(name), writeAttribute('gco:nilReason', nilReason))
+}
+
+function createFeatureCatalogueShell() {
+  return pipe(
+    createNestedElement(
+      'mdb:contentInfo',
+      'mrc:MD_FeatureCatalogue',
+      'mrc:featureCatalogue',
+      'gfc:FC_FeatureCatalogue'
+    ),
+    // create mandatory elements which are not part of the model yet
+    appendChildren(
+      createNilElement('cat:name', 'missing'),
+      createNilElement('cat:scope', 'missing'),
+      createNilElement('cat:versionNumber', 'missing'),
+      createNilElement('cat:versionDate', 'missing'),
+      createNilElement('gfc:producer', 'missing')
+    )
+  )
+}
+
+function createListedValue(value: DatasetFeatureAttributeValue) {
+  return pipe(
+    createNestedElement('gfc:listedValue', 'gfc:FC_ListedValue'),
+    appendChildren(
+      value.label
+        ? pipe(createElement('gfc:label'), writeCharacterString(value.label))
+        : createNilElement('gfc:label', 'missing'),
+      value.value
+        ? pipe(createElement('gfc:code'), writeCharacterString(value.value))
+        : null,
+      value.description
+        ? pipe(
+            createElement('gfc:definition'),
+            writeCharacterString(value.description)
+          )
+        : null
+    )
+  )
+}
+
+function createFeatureAttribute(attribute: DatasetFeatureAttribute) {
+  return pipe(
+    createNestedElement(
+      'gfc:carrierOfCharacteristics',
+      'gfc:FC_FeatureAttribute'
+    ),
+    appendChildren(
+      pipe(createElement('gfc:memberName'), setTextContent(attribute.name)),
+      attribute.description
+        ? pipe(
+            createElement('gfc:definition'),
+            writeCharacterString(attribute.description)
+          )
+        : null,
+      createNilElement('gfc:cardinality', 'missing'),
+      attribute.label
+        ? pipe(
+            createElement('gfc:designation'),
+            writeCharacterString(attribute.label)
+          )
+        : null,
+      attribute.code
+        ? pipe(createElement('gfc:code'), writeCharacterString(attribute.code))
+        : null,
+      attribute.type
+        ? pipe(
+            createNestedElement('gfc:valueType', 'gco:TypeName', 'gco:aName'),
+            writeCharacterString(attribute.type)
+          )
+        : null,
+      ...(attribute.values ?? [])
+        .filter((value) => value.value || value.label)
+        .map(createListedValue)
+    )
+  )
+}
+
+function createFeatureType(featureType: DatasetFeatureType) {
+  return pipe(
+    createNestedElement('gfc:featureType', 'gfc:FC_FeatureType'),
+    appendChildren(
+      pipe(createElement('gfc:typeName'), setTextContent(featureType.name)),
+      featureType.description
+        ? pipe(
+            createElement('gfc:definition'),
+            writeCharacterString(featureType.description)
+          )
+        : null,
+      pipe(
+        createNestedElement('gfc:isAbstract', 'gco:Boolean'),
+        setTextContent('false')
+      ),
+      featureType.label
+        ? pipe(
+            createElement('gfc:designation'),
+            writeCharacterString(featureType.label)
+          )
+        : null,
+      ...featureType.attributes.map(createFeatureAttribute),
+      createNilElement('gfc:featureCatalogue', 'missing')
+    )
+  )
+}
+
+export function writeFeatureTypeDescriptions(
+  record: DatasetRecord,
+  rootEl: XmlElement
+) {
+  const featureTypes = record.featureTypeDescriptions ?? []
+  const catalogues = findNestedElements(
+    'mdb:contentInfo',
+    'mrc:MD_FeatureCatalogue',
+    'mrc:featureCatalogue',
+    'gfc:FC_FeatureCatalogue'
+  )(rootEl)
+  catalogues.forEach((catalogue) =>
+    removeChildrenByName('gfc:featureType')(catalogue)
+  )
+  if (!featureTypes.length) return
+
+  const catalogue =
+    catalogues[0] ?? appendChildTree(createFeatureCatalogueShell())(rootEl)
+  appendChildren(...featureTypes.map(createFeatureType))(catalogue)
+}

package/src/libs/api/metadata-converter/src/lib/iso19139/iso19139.converter.ts

@@ -423,6 +423,8 @@ export class Iso19139Converter extends BaseConverter<string> {
 
     if (record.kind === 'dataset') {
       fieldChanged('status') && this.writers['status'](record, rootEl)
+      fieldChanged('featureTypeDescriptions') &&
+        this.writers['featureTypeDescriptions'](record, rootEl)
     }
     if (record.kind === 'dataset' || record.kind === 'reuse') {
       fieldChanged('updateFrequency') &&

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

@@ -19,6 +19,7 @@ import {
   DatasetFeatureCatalog,
   LanguageCode,
   LinkedRecord,
+  RecordFlag,
   RecordRelation,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
@@ -36,6 +37,7 @@ import {
   LanguagesApiService,
   RecordsApiService,
   SearchApiService,
+  TagsApiService,
 } from '../../../../../../libs/data-access/gn4/src'
 import {
   combineLatest,
@@ -48,7 +50,13 @@ import {
   switchMap,
   throwError,
 } from 'rxjs'
-import { catchError, map, tap } from 'rxjs/operators'
+import {
+  catchError,
+  map,
+  shareReplay,
+  tap,
+  withLatestFrom,
+} from 'rxjs/operators'
 import { lt } from 'semver'
 import { ElasticsearchService } from './elasticsearch'
 import { toLang2 } from '../../../../../../libs/util/i18n/src'
@@ -80,6 +88,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
   private platformService = inject(PlatformServiceInterface)
   private gn4LanguagesApi = inject(LanguagesApiService)
   private settingsService = inject(Gn4SettingsService)
+  private gn4TagsApi = inject(TagsApiService)
   private disableDraft = inject(DISABLE_DRAFT, { optional: true }) ?? false
   private defaultConverter = inject(DEFAULT_RECORD_CONVERTER)
 
@@ -675,4 +684,72 @@ export class Gn4Repository implements RecordsRepositoryInterface {
   private removeRecordFromLocalStorage(recordId: string): void {
     window.localStorage.removeItem(this.getLocalStorageKeyForRecord(recordId))
   }
+
+  /*
+   * FLAGS
+   * Note: in GN4 API, categories are named "tags"
+   */
+
+  categoriesIdentifierForFlags: Observable<Record<RecordFlag, number>> =
+    this.gn4TagsApi.getTags().pipe(
+      map((categories) =>
+        categories.reduce(
+          (acc, category) => {
+            if (category.name.startsWith('geonetwork-ui-flag:')) {
+              acc[
+                category.name.replace(/^geonetwork-ui-flag:/, '') as RecordFlag
+              ] = category.id
+            }
+            return acc
+          },
+          {} as Record<RecordFlag, number>
+        )
+      ),
+      shareReplay(1)
+    )
+
+  private getCategoryIdForFlag(
+    flagName: RecordFlag
+  ): Observable<number | null> {
+    return this.categoriesIdentifierForFlags.pipe(
+      map((categories) => {
+        const categoryId = categories[flagName]
+        if (categoryId === undefined) {
+          console.warn(
+            `The record flag ${flagName} is not created on GeoNetwork backend; please create a category with the name geonetwork-ui-flag:${flagName} for this to work.`
+          )
+          return null
+        }
+        return categoryId
+      })
+    )
+  }
+
+  setRecordFlag(
+    uniqueIdentifier: string,
+    flagName: RecordFlag,
+    value: boolean
+  ): Observable<void> {
+    return this.getCategoryIdForFlag(flagName).pipe(
+      switchMap((categoryId) => {
+        if (categoryId === null) return of()
+        return value
+          ? this.gn4RecordsApi.tagRecord(uniqueIdentifier, [categoryId], false)
+          : this.gn4RecordsApi.deleteTags(uniqueIdentifier, [categoryId])
+      })
+    )
+  }
+
+  getRecordFlag(
+    uniqueIdentifier: string,
+    flagName: RecordFlag
+  ): Observable<boolean> {
+    return this.gn4RecordsApi.getRecordTags(uniqueIdentifier).pipe(
+      withLatestFrom(this.getCategoryIdForFlag(flagName)),
+      map(([tags, categoryId]) => {
+        if (categoryId === null) return false
+        return Array.from(tags).some((tag) => tag.id === categoryId)
+      })
+    )
+  }
 }

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

@@ -92,6 +92,13 @@ export class Gn4PlatformService implements PlatformServiceInterface {
         switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
         shareReplay({ bufferSize: 1, refCount: true })
       )
+  private isAdmin$ = this.disableAuth
+    ? of(false)
+    : of(true).pipe(
+        switchMap(() => this.meApi.getMe()),
+        map((apiUser) => !!apiUser?.admin),
+        shareReplay({ bufferSize: 1, refCount: true })
+      )
 
   /**
    * A map of already loaded thesauri (groups of keywords); the key is a URI
@@ -146,6 +153,10 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     return this.isUserAnonymous$
   }
 
+  isAdministrator(): Observable<boolean> {
+    return this.isAdmin$
+  }
+
   getOrganizations(): Observable<Organization[]> {
     return undefined
   }

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

@@ -0,0 +1 @@
+export type RecordFlag = 'IS_REFERENCE_DATASET'

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

@@ -3,3 +3,4 @@ export * from './metadata.model'
 export * from './organization.model'
 export * from './translation.model'
 export * from './user-feedbacks.model'
+export * from './flags.model'

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

@@ -316,7 +316,7 @@ export interface DatasetRecord extends BaseRecord {
   spatialExtents: Array<DatasetSpatialExtent>
   temporalExtents: Array<DatasetTemporalExtent>
   spatialRepresentation?: SpatialRepresentationType
-  featureTypeDescriptions?: DatasetFeatureCatalog['featureTypes']
+  featureTypeDescriptions?: Array<DatasetFeatureType>
 }
 
 export interface ServiceEndpoint {
@@ -348,20 +348,23 @@ export interface ReuseRecord extends BaseRecord {
   temporalExtents: Array<DatasetTemporalExtent>
 }
 
+export interface DatasetFeatureType {
+  name: string
+  label?: string
+  description?: string
+  attributes: DatasetFeatureAttribute[]
+}
 export type DatasetFeatureCatalog = {
-  featureTypes: Array<{
-    name: string
-    description?: string
-    attributes: DatasetFeatureAttribute[]
-  }>
+  featureTypes: Array<DatasetFeatureType>
 }
 export interface DatasetFeatureAttributeValue {
-  code?: string
-  description?: string
+  value: string // empty string when the value has no code
   label?: string
+  description?: string
 }
 export interface DatasetFeatureAttribute {
   name: string
+  label?: string
   description?: string
   type?: string
   code?: string

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

@@ -28,6 +28,7 @@ export abstract class PlatformServiceInterface {
   abstract supportsAuthentication(): boolean
   abstract getMe(): Observable<UserModel>
   abstract isAnonymous(): Observable<boolean>
+  abstract isAdministrator(): Observable<boolean>
   abstract getUsers(): Observable<UserModel[]>
   abstract getUserPermissionsByGroup(): Observable<GroupModel[]>
   abstract getUsersByOrganization(

package/src/libs/common/domain/src/lib/repository/records-repository.interface.ts

@@ -11,6 +11,7 @@ import {
   DatasetFeatureCatalog,
   LanguageCode,
   LinkedRecord,
+  RecordFlag,
 } from '../model/record'
 
 export abstract class RecordsRepositoryInterface {
@@ -106,4 +107,22 @@ export abstract class RecordsRepositoryInterface {
   ): Observable<{ user: string; date: Date }>
   abstract getRecordPublicationStatus(uuid: string): Observable<boolean>
   abstract getApplicationLanguages(): Observable<LanguageCode[]>
+
+  /**
+   * Sets a given flag on a record. Flags are not part of the metadata document, which is why they are
+   * not part of the Record model.
+   */
+  abstract setRecordFlag(
+    uniqueIdentifier: string,
+    flagName: RecordFlag,
+    value: boolean
+  ): Observable<void>
+
+  /**
+   * Checks whether a given flag is enabled for a record.
+   */
+  abstract getRecordFlag(
+    uniqueIdentifier: string,
+    flagName: RecordFlag
+  ): Observable<boolean>
 }

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

@@ -182,9 +182,9 @@ As such, **it is not very interesting at all.**`,
             code: 'NOM',
             type: 'String (48)',
             values: [
-              { code: 'Pomme', label: 'Les Pommiers' },
-              { code: 'Cotton', label: 'Rue Cotton' },
-              { code: "Passage de l'échiquier" },
+              { value: 'Pomme', label: 'Les Pommiers' },
+              { value: 'Cotton', label: 'Rue Cotton' },
+              { value: "Passage de l'échiquier" },
             ],
           },
           {

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

@@ -9,10 +9,7 @@ import {
 
 import { SortableListComponent } from '../../../../../../../../../libs/ui/layout/src'
 import { ConstraintCardComponent } from '../../../constraint-card/constraint-card.component'
-import {
-  CatalogRecordKeys,
-  Constraint,
-} from '../../../../../../../../../libs/common/domain/src/lib/model/record'
+import { Constraint } from '../../../../../../../../../libs/common/domain/src/lib/model/record'
 import { ButtonComponent } from '../../../../../../../../../libs/ui/inputs/src'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import { TranslatePipe } from '@ngx-translate/core'
@@ -22,6 +19,7 @@ import {
   provideNgIconsConfig,
 } from '@ng-icons/core'
 import { iconoirPlus } from '@ng-icons/iconoir'
+import { FormFieldModel } from '../../../../models'
 
 marker('editor.record.form.constraint.add.legalConstraints')
 marker('editor.record.form.constraint.add.securityConstraints')
@@ -53,7 +51,7 @@ marker('editor.record.form.constraint.header.otherConstraints')
 export class FormFieldConstraintsComponent implements OnInit {
   @Input() label: string
   @Input() value: Constraint[]
-  @Input() constraintType: CatalogRecordKeys
+  @Input() constraintType: FormFieldModel
   @Output() valueChange = new EventEmitter<Constraint[]>()
 
   constraintsHeader = ''

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

@@ -36,7 +36,7 @@ import {
 } from '../../../../../../../../../libs/util/shared/src'
 import { map } from 'rxjs/operators'
 import { SortableListComponent } from '../../../../../../../../../libs/ui/layout/src'
-import { FieldModelSpecifier } from '../../../../models/editor-config.model'
+import { FormFieldModelSpecifier } from '../../../../models/editor-config.model'
 
 @Component({
   selector: 'gn-ui-form-field-contacts',
@@ -59,7 +59,7 @@ export class FormFieldContactsComponent implements OnDestroy, OnChanges {
   private changeDetectorRef = inject(ChangeDetectorRef)
 
   @Input() value: Individual[]
-  @Input() modelSpecifier: FieldModelSpecifier
+  @Input() modelSpecifier: FormFieldModelSpecifier
   @Output() valueChange: EventEmitter<Individual[]> = new EventEmitter()
 
   contacts: Individual[] = []

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

@@ -0,0 +1,18 @@
+<div class="flex-1 flex justify-between items-center">
+  <gn-ui-check-toggle
+    [label]="labelKey() | translate"
+    [value]="initialValue$ | async"
+    (toggled)="onToggle($event)"
+    [attr.data-cy]="'record-flag-toggle-' + flagName()"
+  ></gn-ui-check-toggle>
+
+  @if (hintKey()) {
+  <ng-icon
+    name="matHelpOutline"
+    size="16"
+    class="m-2"
+    [matTooltip]="hintKey() | translate"
+    matTooltipPosition="above"
+  ></ng-icon>
+  }
+</div>

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

@@ -0,0 +1,86 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  inject,
+  input,
+} from '@angular/core'
+import { AsyncPipe } from '@angular/common'
+import { CheckToggleComponent } from '../../../../../../../../../libs/ui/inputs/src'
+import { EditorFacade } from '../../../../+state/editor.facade'
+import { TranslatePipe, TranslateService } from '@ngx-translate/core'
+import { RecordFlag } from '../../../../../../../../../libs/common/domain/src/lib/model'
+import { RecordsRepositoryInterface } from '../../../../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
+import { toSignal } from '@angular/core/rxjs-interop'
+import { filter } from 'rxjs'
+import { NgIcon, provideIcons } from '@ng-icons/core'
+import { MatTooltip } from '@angular/material/tooltip'
+import { map, switchMap } from 'rxjs/operators'
+import { matHelpOutline } from '@ng-icons/material-icons/outline'
+import { NotificationsService } from '../../../../../../../../../libs/feature/notifications/src'
+
+@Component({
+  selector: 'gn-ui-form-field-record-flag',
+  standalone: true,
+  imports: [AsyncPipe, CheckToggleComponent, TranslatePipe, NgIcon, MatTooltip],
+  viewProviders: [
+    provideIcons({
+      matHelpOutline,
+    }),
+  ],
+  templateUrl: './form-field-record-flag-component.html',
+  styleUrls: ['./form-field-record-flag-component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class FormFieldRecordFlagComponent {
+  flagName = input<RecordFlag>()
+  labelKey = input<string>()
+  hintKey = input<string>()
+
+  private editorFacade = inject(EditorFacade)
+  private repository = inject(RecordsRepositoryInterface)
+  private notificationsService = inject(NotificationsService)
+  private translateService = inject(TranslateService)
+
+  private record = toSignal(this.editorFacade.record$)
+
+  recordKind = toSignal(
+    this.editorFacade.record$.pipe(map((record) => record.kind))
+  )
+  initialValue$ = this.editorFacade.record$.pipe(
+    filter((record) => !!record),
+    switchMap((record) =>
+      this.repository.getRecordFlag(record.uniqueIdentifier, this.flagName())
+    )
+  )
+
+  onToggle(enabled: boolean) {
+    if (this.record() === null) {
+      return
+    }
+    this.repository
+      .setRecordFlag(this.record().uniqueIdentifier, this.flagName(), enabled)
+      .subscribe({
+        next: () => {
+          // do nothing
+        },
+        error: (error) => {
+          this.notificationsService.showNotification(
+            {
+              type: 'error',
+              title: this.translateService.instant(
+                'editor.record.flag.saveError.title'
+              ),
+              text: `${this.translateService.instant(
+                'editor.record.flag.saveError.body',
+                {
+                  recordKind: this.recordKind(),
+                }
+              )} ${error.message}`,
+            },
+            undefined,
+            error
+          )
+        },
+      })
+  }
+}