geonetwork-ui 2.11.0-dev.80a8b0bfa → 2.11.0-dev.840dcc932

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

@@ -316,6 +316,7 @@ export interface DatasetRecord extends BaseRecord {
   spatialExtents: Array<DatasetSpatialExtent>
   temporalExtents: Array<DatasetTemporalExtent>
   spatialRepresentation?: SpatialRepresentationType
+  featureTypeDescriptions?: Array<DatasetFeatureType>
 }
 
 export interface ServiceEndpoint {
@@ -347,33 +348,28 @@ 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
-    definition: string
-    attributes: DatasetFeatureAttribute[]
-  }>
+  featureTypes: Array<DatasetFeatureType>
 }
 export interface DatasetFeatureAttributeValue {
-  code?: string
-  definition?: string
+  value: string // empty string when the value has no code
   label?: string
+  description?: string
 }
 export interface DatasetFeatureAttribute {
   name: string
-  definition: string
-  type: string
-  code: string
+  label?: string
+  description?: string
+  type?: string
+  code?: string
   values?: Array<DatasetFeatureAttributeValue>
 }
-export interface DatasetFeatureType {
-  aliases: string
-  code: string
-  isAbstract: string
-  typeName: string
-  definition: string
-  attributeTable: Array<DatasetFeatureAttribute>
-}
 
 export type ReuseType = 'application' | 'map' | 'other'
 

package/src/libs/common/domain/src/lib/model/search/aggregation.model.ts

@@ -7,6 +7,8 @@ export interface TermsAggregationParams {
   limit: number
   sort: AggregationSort
   filter?: string
+  includeValues?: string[]
+  excludeValues?: string[]
 }
 export interface HistogramAggregationParams {
   type: 'histogram'

package/src/libs/common/domain/src/lib/model/search/filter.model.ts

@@ -6,17 +6,39 @@ export type FieldFilterByRange = {
   start?: Date
   end?: Date
 }
+// matches util/shared's BoundingBox; duplicated here to avoid a circular
+// dependency (util/shared already depends on common/domain)
+export type FieldFilterByBoundingBox = [number, number, number, number]
 
 export type FieldFilter =
   | FieldFilterByExpression
   | FieldFilterByValues
   | FieldFilterByRange
+  | FieldFilterByBoundingBox
 export type FieldFilters = Record<FieldName, FieldFilter>
 
 export type QueryString = {
   query_string: string
 }
 export type QueryRange = {
-  range: Record<string, { format: string; gte: string; lte: string }>
+  range: Record<
+    string,
+    { format: string; gte?: string; lte?: string; relation?: string }
+  >
 }
-export type FilterQuery = Array<QueryString | QueryRange>
+export type QueryGeoShape = {
+  geo_shape: {
+    geom: {
+      shape: { type: string; coordinates: number[][] }
+      relation: string
+    }
+  }
+}
+export type QueryBool = {
+  bool: {
+    filter: QueryRange[]
+  }
+}
+export type FilterQuery = Array<
+  QueryString | QueryRange | QueryGeoShape | QueryBool
+>

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,13 +11,14 @@ import {
   DatasetFeatureCatalog,
   LanguageCode,
   LinkedRecord,
+  RecordFlag,
 } from '../model/record'
 
 export abstract class RecordsRepositoryInterface {
   abstract search(params: SearchParams): Observable<SearchResults>
   abstract getMatchesCount(filters: FieldFilters): Observable<number>
   abstract getRecord(uniqueIdentifier: string): Observable<CatalogRecord | null>
-  abstract getFeatureCatalog(
+  abstract queryLinkedFeatureCatalog(
     record: CatalogRecord
   ): Observable<DatasetFeatureCatalog | null>
   abstract aggregate(params: AggregationsParams): Observable<Aggregations>
@@ -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

@@ -164,69 +164,49 @@ As such, **it is not very interesting at all.**`,
     extras: {
       isPublishedToAll: true,
       edit: true,
-      featureTypes: [
-        {
-          attributeTable: [
-            {
-              code: 'OBJECTID',
-              name: 'OBJECTID',
-              link: '',
-              definition: 'Object identifier',
-              type: 'OID',
-            },
-            {
-              code: 'NOM',
-              name: 'Nom',
-              link: '',
-              definition: 'Nom de la rue',
-              type: 'String (48)',
-              values: [
-                {
-                  code: 'Pomme',
-                  label: 'Les Pommiers',
-                  description: 'Sous les pommiers',
-                },
-                {
-                  code: 'Cotton',
-                  label: 'Rue Cotton',
-                  description: 'Rue Cotton',
-                },
-                { code: "Passage de l'échiquier" },
-                { description: 'Rue du Charlieu' },
-              ],
-            },
-            {
-              code: 'RUE',
-              name: 'Rue',
-              link: '',
-              definition: '',
-              type: 'String (50)',
-            },
-          ],
-          code: '',
-          aliases: '',
-          typeName: "Catalogue d'attributs N°1",
-          definition: 'Définition du catalogue d attributs N°1',
-          isAbstract: 'false',
-        },
-        {
-          attributeTable: [
-            {
-              code: 'UniqueObject',
-              name: 'unique object ',
-              link: '',
-              definition: 'this is the only object of this catalog',
-              type: 'String (50)',
-            },
-          ],
-          code: '',
-          aliases: '',
-          typeName: "Catalogue d'attributs N°2",
-          definition: 'Définition du catalogue d attributs N°2',
-          isAbstract: 'false',
-        },
-      ],
     },
+    featureTypeDescriptions: [
+      {
+        name: "Catalogue d'attributs N°1",
+        description: 'Définition du catalogue d attributs N°1',
+        attributes: [
+          {
+            name: 'OBJECTID',
+            description: 'Object identifier',
+            code: 'OBJECTID',
+            type: 'OID',
+          },
+          {
+            name: 'Nom',
+            description: 'Nom de la rue',
+            code: 'NOM',
+            type: 'String (48)',
+            values: [
+              { value: 'Pomme', label: 'Les Pommiers' },
+              { value: 'Cotton', label: 'Rue Cotton' },
+              { value: "Passage de l'échiquier" },
+            ],
+          },
+          {
+            name: 'Rue',
+            code: 'RUE',
+            type: 'String (50)',
+          },
+        ],
+      },
+      {
+        name: "Catalogue d'attributs N°2",
+        description: 'Définition du catalogue d attributs N°2',
+        attributes: [
+          {
+            name: 'unique object ',
+            description: 'this is the only object of this catalog',
+            code: 'UniqueObject',
+            type: 'String (50)',
+          },
+        ],
+      },
+    ],
   },
   {
     uniqueIdentifier: '7d002c4c-92ef-4b9f-a568-d732f740b99e',

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

@@ -209,7 +209,8 @@ export class DataService {
     ogcApiLink: DatasetServiceDistribution
   ): Promise<DatasetOnlineResource[]> {
     const collectionInfo = await this.getDownloadUrlsFromOgcApi(
-      ogcApiLink.url.href
+      ogcApiLink.url.href,
+      ogcApiLink.name
     )
 
     return Object.keys(collectionInfo.bulkDownloadLinks).map((mimeType) => {
@@ -229,31 +230,41 @@ export class DataService {
     })
   }
 
-  async getDownloadUrlsFromOgcApi(url: string): Promise<OgcApiCollectionInfo> {
+  private async getTargetCollectionId(
+    endpoint: OgcApiEndpoint,
+    collectionId?: string
+  ): Promise<string | undefined> {
+    const collections = await endpoint.featureCollections
+    return collections.length === 1 && !collectionId
+      ? collections[0]
+      : collectionId
+  }
+
+  async getDownloadUrlsFromOgcApi(
+    url: string,
+    collectionId?: string
+  ): Promise<OgcApiCollectionInfo> {
     const endpoint = new OgcApiEndpoint(url)
-    return await endpoint.featureCollections
-      .then((collections) => {
-        return endpoint.getCollectionInfo(collections[0])
-      })
-      .catch((error) => {
-        throw new Error(`ogc.unreachable.unknown`)
-      })
+    try {
+      const id = await this.getTargetCollectionId(endpoint, collectionId)
+      return await endpoint.getCollectionInfo(id)
+    } catch {
+      throw new Error('ogc.unreachable.unknown')
+    }
   }
 
   async getItemsFromOgcApi(
     url: string,
+    collectionId?: string,
     limit?: number
   ): Promise<OgcApiRecord[]> {
     const endpoint = new OgcApiEndpoint(url)
-    return await endpoint.featureCollections
-      .then((collections) => {
-        return collections.length
-          ? endpoint.getCollectionItems(collections[0], limit)
-          : null
-      })
-      .catch(() => {
-        throw new Error(`ogc.unreachable.unknown`)
-      })
+    try {
+      const id = await this.getTargetCollectionId(endpoint, collectionId)
+      return await endpoint.getCollectionItems(id, limit)
+    } catch {
+      throw new Error('ogc.unreachable.unknown')
+    }
   }
 
   async getItemsFromStacApi(
@@ -381,7 +392,9 @@ export class DataService {
       link.type === 'service' &&
       link.accessServiceProtocol === 'ogcFeatures'
     ) {
-      return from(this.getDownloadUrlsFromOgcApi(link.url.href)).pipe(
+      return from(
+        this.getDownloadUrlsFromOgcApi(link.url.href, link.name)
+      ).pipe(
         switchMap((collectionInfo) => {
           const isMimeTypeJson = (mimeType: string): boolean => {
             return mimeType.toLowerCase().indexOf('json') > -1

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
+          )
+        },
+      })
+  }
+}