wip

geonetwork · Feb 26, 2025 · 0451715 · 0451715
1 parent 7f9c42f
commit 0451715
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 24 deletions.
diff --git a/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.ts b/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.ts
@@ -202,4 +202,9 @@ export interface Gn4Record {
   featured?: boolean
   guestdownload?: boolean
   selected?: boolean
+  related?: Gn4RecordRelated
+}
+
+export interface Gn4RecordRelated {
+  fcats?: Gn4Record[]
 }
diff --git a/libs/api/repository/src/lib/gn4/gn4-repository.ts b/libs/api/repository/src/lib/gn4/gn4-repository.ts
@@ -65,7 +65,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     private gn4Mapper: Gn4Converter,
     private gn4RecordsApi: RecordsApiService,
     private platformService: PlatformServiceInterface
-  ) {}
+  ) { }
 
   search({
     filters,
@@ -141,25 +141,48 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       )
   }
 
+  /**
+   * Retrieve the feature catalog (or attributes catalog) from a linked record.
+   * By default, returns extras.features from the record, otherwise call api again to get the "fcats".
+   * The GeoNetwork API support multiple feature catalogs, in that case, on the first one is read.
+   * @param metadataUuid The linked record indentifier
+   * @param approvedVersion 
+   * @returns 
+   */
   getFeatureCatalog(
-    metadataUuid: string,
-    approvedVersion?: boolean
+    record: CatalogRecord
   ): Observable<DatasetFeatureCatalog | null> {
-    return this.gn4RecordsApi
-      .getFeatureCatalog(metadataUuid, approvedVersion)
-      .pipe(
-        map((results: FeatureResponseApiModel) => {
-          if (results.decodeMap) {
-            const features = Object.keys(results.decodeMap).map((key) => {
-              const feature = results.decodeMap[key]
-              return { name: feature[0], title: feature[1] }
-            })
-            return { features } as DatasetFeatureCatalog
-          }
-          return null
-        }),
-        switchMap((record) => (record ? of(record) : of(null)))
+
+    if (false) {
+      // TODO:
+      // record extras.features
+    }
+
+    return this.gn4SearchApi.search('bucket', ['fcats'], JSON.stringify(
+      this.gn4SearchHelper.getMetadataByIdPayload(record.uniqueIdentifier)
+    )).pipe(
+      map((results: Gn4SearchResults) => results.hits.hits[0]),
+      switchMap((record) =>
+        record && record.related.fcats[0] ? this.getRecord(record.related.fcats[0]._id) : of(null)
       )
+    )
+
+
+    // return this.gn4RecordsApi
+    //   .getFeatureCatalog(metadataUuid, approvedVersion)
+    //   .pipe(
+    //     map((results: FeatureResponseApiModel) => {
+    //       if (results.decodeMap) {
+    //         const features = Object.keys(results.decodeMap).map((key) => {
+    //           const feature = results.decodeMap[key]
+    //           return { name: feature[0], title: feature[1] }
+    //         })
+    //         return { features } as DatasetFeatureCatalog
+    //       }
+    //       return null
+    //     }),
+    //     switchMap((record) => (record ? of(record) : of(null)))
+    //   )
   }
 
   getSimilarRecords(similarTo: CatalogRecord): Observable<CatalogRecord[]> {
@@ -229,8 +252,8 @@ export class Gn4Repository implements RecordsRepositoryInterface {
   getRecordPublicationStatus(uniqueIdentifier: string): Observable<boolean> {
     return uniqueIdentifier
       ? this.getRecord(uniqueIdentifier).pipe(
-          map((record) => record.extras['isPublishedToAll'] as boolean)
-        )
+        map((record) => record.extras['isPublishedToAll'] as boolean)
+      )
       : of(true)
   }
 

diff --git a/libs/common/domain/src/lib/repository/records-repository.interface.ts b/libs/common/domain/src/lib/repository/records-repository.interface.ts
@@ -12,10 +12,7 @@ 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(
-    metadataUuid: string,
-    approvedVersion?: boolean
-  ): Observable<DatasetFeatureCatalog | null>
+  abstract getFeatureCatalog(record: CatalogRecord): Observable<DatasetFeatureCatalog | null>
   abstract aggregate(params: AggregationsParams): Observable<Aggregations>
   abstract getSimilarRecords(
     similarTo: CatalogRecord

diff --git a/libs/feature/router/src/lib/default/state/router.effects.ts b/libs/feature/router/src/lib/default/state/router.effects.ts
@@ -32,7 +32,7 @@ export class RouterEffects {
     private facade: RouterFacade,
     @Inject(ROUTER_CONFIG) private routerConfig: RouterConfigModel,
     private fieldsService: FieldsService
-  ) {}
+  ) { }
 
   navigate$ = createEffect(
     () =>
@@ -121,6 +121,10 @@ export class RouterEffects {
                 title: '',
               },
             }),
+            MdViewActions.loadFeatureCatalogAttributes({
+              metadataUuid: activatedRouteSnapshot.params.metadataUuid,
+              approvedVersion: false
+            }),
             MdViewActions.loadFullMetadata({
               uuid: activatedRouteSnapshot.params.metadataUuid,
             })