geonetwork-ui 2.5.0-dev.b51c2cb0f → 2.5.0-dev.b87edcffd

package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts

@@ -51,7 +51,7 @@ export class ElasticsearchService {
     size = 0,
     from = 0,
     sortBy: SortByField = null,
-    requestFields: RequestFields = [],
+    requestFields: RequestFields = null,
     searchFilters: SearchFilters = {},
     configFilters: SearchFilters = {},
     uuids?: string[],
@@ -69,7 +69,7 @@ export class ElasticsearchService {
         geometry
       ),
       ...(size > 0 ? { track_total_hits: true } : {}),
-      _source: requestFields,
+      ...(requestFields && { _source: requestFields }),
     }
     this.processRuntimeFields(payload)
     return payload
@@ -234,6 +234,7 @@ export class ElasticsearchService {
   private filtersToQuery(
     filters: FieldFilters | FiltersAggregationParams | string
   ): FilterQuery {
+    const addQuote = (key: string) => (/^\/.+\/$/.test(key) ? key : `"${key}"`)
     const makeQuery = (filter: FieldFilter): string => {
       if (typeof filter === 'string') {
         return filter
@@ -241,9 +242,9 @@ export class ElasticsearchService {
       return Object.keys(filter)
         .map((key) => {
           if (filter[key] === true) {
-            return `"${key}"`
+            return addQuote(key)
           }
-          return `-"${key}"`
+          return `-${addQuote(key)}`
         })
         .join(' OR ')
     }
@@ -296,6 +297,25 @@ export class ElasticsearchService {
     return queryParts.length > 0 ? (queryParts as FilterQuery) : undefined
   }
 
+  private mustNotFilters(): Record<string, unknown>[] {
+    return [
+      {
+        ...this.queryFilterOnValues('resourceType', [
+          'service',
+          'map',
+          'map/static',
+          'mapDigital',
+        ]),
+      },
+      {
+        query_string: {
+          query:
+            'resourceType:featureCatalog AND !resourceType:dataset AND !cl_level.key:dataset',
+        },
+      },
+    ]
+  }
+
   private buildPayloadQuery(
     { any, ...fieldSearchFilters }: SearchFilters,
     configFilters: SearchFilters,
@@ -303,14 +323,7 @@ export class ElasticsearchService {
     geometry?: Geometry
   ) {
     const must = [] as Record<string, unknown>[]
-    const must_not = {
-      ...this.queryFilterOnValues('resourceType', [
-        'service',
-        'map',
-        'map/static',
-        'mapDigital',
-      ]),
-    }
+    const must_not = this.mustNotFilters()
     const should = [] as Record<string, unknown>[]
     const filter = [this.queryFilterOnValues('isTemplate', 'n')] as Record<
       string,
@@ -412,14 +425,8 @@ export class ElasticsearchService {
               },
             },
           ],
-          must_not: {
-            ...this.queryFilterOnValues('resourceType', [
-              'service',
-              'map',
-              'map/static',
-              'mapDigital',
-            ]),
-          },
+
+          must_not: this.mustNotFilters(),
         },
       },
       _source: ['resourceTitleObject', 'uuid'],
@@ -532,13 +539,15 @@ export class ElasticsearchService {
       switch (aggregation.type) {
         case 'filters':
           return {
-            filters: Object.keys(aggregation.filters).reduce((prev, curr) => {
-              const filter = aggregation.filters[curr]
-              return {
-                ...prev,
-                [curr]: this.filtersToQuery(filter)[0],
-              }
-            }, {}),
+            filters: {
+              filters: Object.keys(aggregation.filters).reduce((prev, curr) => {
+                const filter = aggregation.filters[curr]
+                return {
+                  ...prev,
+                  [curr]: this.filtersToQuery(filter)[0],
+                }
+              }, {}),
+            },
           }
         case 'terms':
           return {

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

@@ -12,7 +12,10 @@ import {
   Iso19139Converter,
 } from '../../../../../../libs/api/metadata-converter/src'
 import { PublicationVersionError } from '../../../../../../libs/common/domain/src/lib/model/error'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  CatalogRecord,
+  DatasetFeatureCatalog,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
   Aggregations,
   AggregationsParams,
@@ -27,6 +30,7 @@ import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain
 import {
   RecordsApiService,
   SearchApiService,
+  FeatureResponseApiModel,
 } from '../../../../../../libs/data-access/gn4/src'
 import {
   combineLatest,
@@ -124,7 +128,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     return this.gn4SearchApi
       .search(
         'bucket',
-        null,
+        ['fcats'],
         JSON.stringify(
           this.gn4SearchHelper.getMetadataByIdPayload(uniqueIdentifier)
         )
@@ -137,6 +141,41 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       )
   }
 
+  getFeatureCatalog(
+    record: CatalogRecord,
+    visited: Set<string> = new Set() // prevent looping
+  ): Observable<DatasetFeatureCatalog | null> {
+    if (
+      record.extras &&
+      record.extras['featureTypes'] &&
+      record.extras['featureTypes'][0]?.attributeTable &&
+      Array.isArray(record.extras['featureTypes'][0].attributeTable)
+    ) {
+      return of({
+        attributes: record.extras['featureTypes'][0]?.attributeTable?.map(
+          (attr) => ({
+            name: attr.name,
+            title: attr.definition,
+          })
+        ),
+      } as DatasetFeatureCatalog)
+    }
+
+    const featureCatalogIdentifier = record.extras[
+      'featureCatalogIdentifier'
+    ] as string
+    if (featureCatalogIdentifier && !visited.has(featureCatalogIdentifier)) {
+      visited.add(featureCatalogIdentifier)
+      return this.getRecord(featureCatalogIdentifier).pipe(
+        switchMap((record) =>
+          record ? this.getFeatureCatalog(record, visited) : of(null)
+        )
+      )
+    }
+
+    return of(null)
+  }
+
   getSimilarRecords(similarTo: CatalogRecord): Observable<CatalogRecord[]> {
     return this.gn4SearchApi
       .search(

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

@@ -226,7 +226,9 @@ export interface DatasetRecord extends BaseRecord {
   temporalExtents: Array<DatasetTemporalExtent>
   spatialRepresentation?: SpatialRepresentationType
 }
-
+export type DatasetFeatureCatalog = {
+  attributes: Array<{ name: string; title: string }>
+}
 export interface ServiceEndpoint {
   endpointUrl: URL
   protocol: string

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

@@ -6,12 +6,15 @@ import {
   SearchParams,
   SearchResults,
 } from '../model/search'
-import { CatalogRecord } from '../model/record'
+import { CatalogRecord, DatasetFeatureCatalog } 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(
+    record: CatalogRecord
+  ): Observable<DatasetFeatureCatalog | null>
   abstract aggregate(params: AggregationsParams): Observable<Aggregations>
   abstract getSimilarRecords(
     similarTo: CatalogRecord

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

@@ -160,6 +160,38 @@ 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)',
+            },
+            {
+              code: 'RUE',
+              name: 'Rue',
+              link: '',
+              definition: '',
+              type: 'String (50)',
+            },
+          ],
+          code: '',
+          aliases: '',
+          typeName: "Catalogue d'attributs",
+          definition: '',
+          isAbstract: 'false',
+        },
+      ],
     },
   },
   {
@@ -312,6 +344,49 @@ export const simpleDatasetRecordFixture = (): DatasetRecord => ({
   translations: {},
 })
 
+export const simpleDatasetRecordWithFcatsFixture = (): DatasetRecord => ({
+  uniqueIdentifier: 'my-dataset-with-fcats',
+  extras: {
+    featureCatalogIdentifier: 'feature-catalog-identifier',
+  },
+  kind: 'dataset',
+  otherLanguages: [],
+  defaultLanguage: 'en',
+  recordUpdated: new Date('2022-02-01T14:12:00.000Z'),
+  resourceCreated: new Date('2022-09-01T12:18:19.000Z'),
+  resourceUpdated: new Date('2022-12-04T14:12:00.000Z'),
+  status: 'ongoing',
+  title: 'A very interesting dataset with a related feature catalog',
+  abstract: `This dataset has been established for testing purposes.`,
+  ownerOrganization: { name: 'MyOrganization', translations: {} },
+  contacts: [
+    {
+      email: 'bob@org.net',
+      position: 'developer',
+      organization: { name: 'MyOrganization', translations: {} },
+      role: 'point_of_contact',
+      firstName: 'Bob',
+      lastName: 'TheGreat',
+    },
+  ],
+  contactsForResource: [],
+  keywords: [],
+  topics: ['testData'],
+  licenses: [],
+  legalConstraints: [],
+  securityConstraints: [],
+  otherConstraints: [],
+  lineage:
+    'This record was edited manually to test the feature catalog parsing',
+  spatialRepresentation: 'grid',
+  overviews: [],
+  spatialExtents: [],
+  temporalExtents: [],
+  onlineResources: [],
+  updateFrequency: { per: 'month', updatedTimes: 3 },
+  translations: {},
+})
+
 export const simpleDatasetRecordAsXmlFixture =
   (): string => `<?xml version="1.0" encoding="UTF-8"?>
 <mdb:MD_Metadata xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0" xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0" xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/2.0">

package/src/libs/feature/dataviz/src/lib/chart-view/chart-view.component.ts

@@ -2,7 +2,9 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
+  Inject,
   Input,
+  Optional,
   Output,
 } from '@angular/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
@@ -65,6 +67,7 @@ marker('chart.aggregation.count')
   standalone: true,
 })
 export class ChartViewComponent {
+  @Input() cacheActive = true
   @Input() set link(value: DatasetOnlineResource) {
     this.currentLink$.next(value)
   }
@@ -134,7 +137,7 @@ export class ChartViewComponent {
     switchMap((link) => {
       this.error = null
       this.loading = true
-      return this.dataService.getDataset(link).pipe(
+      return this.dataService.getDataset(link, this.cacheActive).pipe(
         catchError((error) => {
           this.handleError(error)
           return EMPTY

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

@@ -164,17 +164,26 @@ export class DataService {
       wfsLink.url.toString(),
       wfsLink.name
     ).pipe(
-      map((urls) => urls.all),
-      map((urls) =>
-        Object.keys(urls).map((format) => ({
-          ...wfsLink,
-          type: 'download',
-          url: new URL(urls[format]),
-          mimeType: getMimeTypeForFormat(
-            getFileFormatFromServiceOutput(format)
-          ),
-        }))
-      )
+      map((urls) => {
+        if (urls.geojson) {
+          urls.all['application/json'] = urls.geojson
+        }
+        return urls
+      }),
+      map((urls) => {
+        const resources: DatasetOnlineResource[] = Object.keys(urls.all).map(
+          (format) => ({
+            ...wfsLink,
+            name: wfsLink.name,
+            type: 'download' as const,
+            url: new URL(urls.all[format]),
+            mimeType: getMimeTypeForFormat(
+              getFileFormatFromServiceOutput(format)
+            ),
+          })
+        )
+        return resources
+      })
     )
   }
 
@@ -187,6 +196,7 @@ export class DataService {
     return Object.keys(collectionInfo.bulkDownloadLinks).map((downloadLink) => {
       return {
         ...ogcApiLink,
+        name: collectionInfo.id,
         type: 'download',
         url: new URL(collectionInfo.bulkDownloadLinks[downloadLink]),
         mimeType: getMimeTypeForFormat(
@@ -232,8 +242,11 @@ export class DataService {
     }))
   }
 
-  readAsGeoJson(link: DatasetOnlineResource): Observable<FeatureCollection> {
-    return this.getDataset(link).pipe(
+  readAsGeoJson(
+    link: DatasetOnlineResource,
+    cacheActive: boolean
+  ): Observable<FeatureCollection> {
+    return this.getDataset(link, cacheActive).pipe(
       switchMap((dataset) => dataset.selectAll().read()),
       map((features) => ({
         type: 'FeatureCollection',
@@ -242,13 +255,21 @@ export class DataService {
     )
   }
 
-  getDataset(link: DatasetOnlineResource): Observable<BaseReader> {
+  getDataset(
+    link: DatasetOnlineResource,
+    cacheActive: boolean
+  ): Observable<BaseReader> {
     if (link.type === 'service' && link.accessServiceProtocol === 'wfs') {
       const wfsUrlEndpoint = this.proxy.getProxiedUrl(link.url.toString())
       return from(
-        openDataset(wfsUrlEndpoint, 'wfs', {
-          wfsFeatureType: link.name,
-        })
+        openDataset(
+          wfsUrlEndpoint,
+          'wfs',
+          {
+            wfsFeatureType: link.name,
+          },
+          cacheActive
+        )
       )
     } else if (link.type === 'download') {
       const linkProxifiedUrl = this.proxy.getProxiedUrl(link.url.toString())
@@ -257,7 +278,9 @@ export class DataService {
         SupportedTypes.indexOf(format as any) > -1
           ? (format as SupportedType)
           : undefined
-      return from(openDataset(linkProxifiedUrl, supportedType)).pipe()
+      return from(
+        openDataset(linkProxifiedUrl, supportedType, undefined, cacheActive)
+      ).pipe()
     } else if (
       link.type === 'service' &&
       link.accessServiceProtocol === 'esriRest'
@@ -266,7 +289,7 @@ export class DataService {
         link.url.toString(),
         'geojson'
       )
-      return from(openDataset(url, 'geojson')).pipe()
+      return from(openDataset(url, 'geojson', undefined, cacheActive)).pipe()
     } else if (
       link.type === 'service' &&
       link.accessServiceProtocol === 'ogcFeatures'
@@ -274,7 +297,7 @@ export class DataService {
       return from(this.getDownloadUrlsFromOgcApi(link.url.href)).pipe(
         switchMap((collectionInfo) => {
           const geojsonUrl = collectionInfo.jsonDownloadLink
-          return openDataset(geojsonUrl, 'geojson')
+          return openDataset(geojsonUrl, 'geojson', undefined, cacheActive)
         }),
         tap((url) => {
           if (url === null) {

package/src/libs/feature/dataviz/src/lib/table-view/table-view.component.ts

@@ -33,6 +33,7 @@ import { CommonModule } from '@angular/common'
   standalone: true,
 })
 export class TableViewComponent {
+  @Input() cacheActive = true
   @Input() set link(value: DatasetOnlineResource) {
     this.currentLink$.next(value)
   }
@@ -66,7 +67,7 @@ export class TableViewComponent {
   ) {}
 
   getDatasetReader(link: DatasetOnlineResource): Observable<BaseReader> {
-    return this.dataService.getDataset(link)
+    return this.dataService.getDataset(link, this.cacheActive)
   }
 
   onTableSelect(event) {

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

@@ -2,7 +2,7 @@
   <gn-ui-form-field-rich
     class="mt-[-8px]"
     [label]="label"
-    [hint]="hint | translate"
+    [placeholder]="hint | translate"
     [value]="constraint_.text ?? ''"
     (valueChange)="handleConstraintTextChange($event)"
   ></gn-ui-form-field-rich>

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

@@ -79,6 +79,7 @@ export class FormFieldContactsForResourceComponent
     'owner',
     'point_of_contact',
     'author',
+    'publisher',
   ]
 
   roleSectionsToDisplay: Role[] = []

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

@@ -28,7 +28,7 @@ import { FormFieldWrapperComponent } from '../../../../../../../../../libs/ui/la
 export class FormFieldRichComponent {
   @Input() label: string
   @Input() hint: string
-  @Input() placeholder = 'Votre texte ici' //TODO: translate
+  @Input() placeholder = ''
   @Input() value: string
 
   @Output() valueChange: EventEmitter<string> = new EventEmitter()

package/src/libs/feature/editor/src/lib/components/wizard-field/wizard-field.component.html

@@ -16,19 +16,6 @@
         placeholder=""
       ></gn-ui-text-input>
     </div>
-    <div
-      class="flex-1 w-11/12"
-      *ngIf="wizardFieldType.CHIPS === wizardFieldConfig.type"
-    >
-      <gn-ui-chips-input
-        #chips
-        [selectedItems]="wizardFieldData"
-        placeholder=""
-        [id]="wizardFieldConfig.id"
-        [url]="wizardFieldConfig.options.url"
-        [loadOnce]="wizardFieldConfig.options.loadOnce"
-      ></gn-ui-chips-input>
-    </div>
     <div
       class="h-32 w-11/12"
       *ngIf="wizardFieldType.TEXT_AREA === wizardFieldConfig.type"

package/src/libs/feature/editor/src/lib/components/wizard-field/wizard-field.component.ts

@@ -23,7 +23,6 @@ import { WizardFieldModel } from '../../models/wizard-field.model'
 import { WizardFieldType } from '../../models/wizard-field.type'
 import { WizardService } from '../../services/wizard.service'
 import {
-  ChipsInputComponent,
   DropdownSelectorComponent,
   TextAreaComponent,
   TextInputComponent,
@@ -74,7 +73,6 @@ export class WizardFieldComponent implements AfterViewInit, OnDestroy {
   @Input() wizardFieldConfig: WizardFieldModel
 
   @ViewChild('searchText') searchText: TextInputComponent
-  @ViewChild('chips') chips: ChipsInputComponent
   @ViewChild('textArea') textArea: TextAreaComponent
   @ViewChild('dropdown') dropdown: DropdownSelectorComponent
 
@@ -96,9 +94,6 @@ export class WizardFieldComponent implements AfterViewInit, OnDestroy {
       case WizardFieldType.TEXT: {
         return data || ''
       }
-      case WizardFieldType.CHIPS: {
-        return data ? JSON.parse(data) : []
-      }
       case WizardFieldType.TEXT_AREA: {
         return data || ''
       }
@@ -131,10 +126,6 @@ export class WizardFieldComponent implements AfterViewInit, OnDestroy {
         this.initializeTextInputListener()
         break
       }
-      case WizardFieldType.CHIPS: {
-        this.initializeChipsListener()
-        break
-      }
       case WizardFieldType.TEXT_AREA: {
         this.initializeTextAreaListener()
         return
@@ -161,17 +152,6 @@ export class WizardFieldComponent implements AfterViewInit, OnDestroy {
     )
   }
 
-  private initializeChipsListener() {
-    this.subs.add(
-      this.chips.itemsChange.subscribe((items) => {
-        this.wizardService.onWizardWizardFieldDataChanged(
-          this.wizardFieldConfig.id,
-          JSON.stringify(items)
-        )
-      })
-    )
-  }
-
   private initializeTextAreaListener() {
     this.subs.add(
       this.textArea.valueChange.subscribe((value) => {

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

@@ -275,8 +275,8 @@ export const DEFAULT_CONFIGURATION: EditorConfig = {
       labelKey: marker('editor.record.form.page.description'),
       sections: [
         TITLE_SECTION,
-        ABOUT_SECTION,
         CLASSIFICATION_SECTION,
+        ABOUT_SECTION,
         GEOGRAPHICAL_COVERAGE_SECTION,
       ],
     },

package/src/libs/feature/editor/src/lib/models/wizard-field.type.ts

@@ -1,7 +1,6 @@
 export enum WizardFieldType {
   TEXT,
   TEXT_AREA,
-  CHIPS,
   DATA_PICKER,
   DROPDOWN,
 }

package/src/libs/feature/record/src/lib/data-view/data-view.component.html

@@ -8,15 +8,28 @@
     [choices]="choices"
     (selectValue)="selectLink($event)"
   ></gn-ui-dropdown-selector>
-  <div class="relative h-[460px]">
-    <gn-ui-table-view
-      *ngIf="mode === 'table'"
-      [link]="selectedLink$ | async"
-    ></gn-ui-table-view>
-    <gn-ui-chart-view
-      *ngIf="mode === 'chart'"
-      (chartConfig$)="setChartConfig($event)"
-      [link]="selectedLink$ | async"
-    ></gn-ui-chart-view>
-  </div>
+  <ng-container *ngIf="hidePreview; else dataView">
+    <gn-ui-popup-alert
+      type="warning"
+      icon="matErrorOutlineOutline"
+      class="block h-12 p-1"
+    >
+      <span translate>record.feature.limit</span>
+    </gn-ui-popup-alert>
+  </ng-container>
+  <ng-template #dataView>
+    <div class="relative h-[460px]">
+      <gn-ui-table-view
+        *ngIf="mode === 'table'"
+        [cacheActive]="cacheActive$ | async"
+        [link]="selectedLink$ | async"
+      ></gn-ui-table-view>
+      <gn-ui-chart-view
+        *ngIf="mode === 'chart'"
+        (chartConfig$)="setChartConfig($event)"
+        [cacheActive]="cacheActive$ | async"
+        [link]="selectedLink$ | async"
+      ></gn-ui-chart-view>
+    </div>
+  </ng-template>
 </div>