geonetwork-ui 2.3.0 → 2.3.2

package/libs/feature/record/src/lib/state/mdview.facade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mdview.facade.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/record/src/lib/state/mdview.facade.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,EAAE,MAAM,aAAa,CAAA;AAI3C,OAAO,EAAE,qBAAqB,EAAa,MAAM,wCAAwC,CAAA;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,wFAAwF,CAAA;AAClI,OAAO,EACL,aAAa,EACb,YAAY,EACb,MAAM,2DAA2D,CAAA;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAA;AAGlF,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAA;;AAExE,qBAOa,YAAY;IAErB,OAAO,CAAC,KAAK;IACN,cAAc,EAAE,qBAAqB;IAC5C,OAAO,CAAC,aAAa;IACd,WAAW,EAAE,WAAW;gBAHvB,KAAK,EAAE,KAAK,EACb,cAAc,EAAE,qBAAqB,EACpC,aAAa,EAAE,sBAAsB,EACtC,WAAW,EAAE,WAAW;IAGjC,UAAU,qCAGT;IAED,kBAAkB,qCAEjB;IAED,SAAS,oDAGR;IAED,aAAa,qCAGZ;IAED,MAAM;;;OAA4D;IAElE,QAAQ,6CAAsD;IAE9D,YAAY,uDAA0D;IAEtE,SAAS,8HAER;IAED,SAAS,8HAIR;IAED,YAAY,8HAMX;IAED,cAAc,8HAMb;IAED,UAAU,8HAIT;IAED,aAAa,8HAMZ;IAED,yBAAyB,mCA+BxB;IAED,iBAAiB,mCAEhB;IAED,WAAW,8HAMV;IAED,cAAc,4CAA4D;IAC1E,yBAAyB,qCAExB;IACD,yBAAyB,qCAExB;IAED;;;OAGG;IACH,qBAAqB,CAAC,UAAU,EAAE,aAAa;IAI/C;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM;IAIrB,aAAa;IAIb,cAAc,CAAC,WAAW,EAAE,yBAAyB;IAIrD;;OAEG;IACH,eAAe,CAAC,YAAY,EAAE,YAAY;IAI1C,iBAAiB,CAAC,WAAW,EAAE,MAAM;yCA5J1B,YAAY;6CAAZ,YAAY;CA+JxB"}
+{"version":3,"file":"mdview.facade.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/feature/record/src/lib/state/mdview.facade.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,EAAE,MAAM,aAAa,CAAA;AAY3C,OAAO,EAAE,qBAAqB,EAAa,MAAM,wCAAwC,CAAA;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,wFAAwF,CAAA;AAClI,OAAO,EACL,aAAa,EACb,YAAY,EACb,MAAM,2DAA2D,CAAA;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,2CAA2C,CAAA;AAGlF,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAA;;AAExE,qBAOa,YAAY;IAErB,OAAO,CAAC,KAAK;IACN,cAAc,EAAE,qBAAqB;IAC5C,OAAO,CAAC,aAAa;IACd,WAAW,EAAE,WAAW;gBAHvB,KAAK,EAAE,KAAK,EACb,cAAc,EAAE,qBAAqB,EACpC,aAAa,EAAE,sBAAsB,EACtC,WAAW,EAAE,WAAW;IAGjC,UAAU,qCAGT;IAED,kBAAkB,qCAEjB;IAED,SAAS,oDAGR;IAED,aAAa,qCAGZ;IAED,MAAM;;;OAA4D;IAElE,QAAQ,6CAAsD;IAE9D,YAAY,uDAA0D;IAEtE,SAAS,8HAER;IAED,SAAS,8HAIR;IAED,YAAY,8HAMX;IAED,cAAc,8HAMb;IAED,UAAU,8HAIT;IAED,aAAa,8HAMZ;IAED,yBAAyB,mCAkCxB;IAED,iBAAiB,mCAEhB;IAED,WAAW,8HAMV;IAED,cAAc,4CAA4D;IAC1E,yBAAyB,qCAExB;IACD,yBAAyB,qCAExB;IAED;;;OAGG;IACH,qBAAqB,CAAC,UAAU,EAAE,aAAa;IAI/C;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM;IAIrB,aAAa;IAIb,cAAc,CAAC,WAAW,EAAE,yBAAyB;IAIrD;;OAEG;IACH,eAAe,CAAC,YAAY,EAAE,YAAY;IAI1C,iBAAiB,CAAC,WAAW,EAAE,MAAM;yCA/J1B,YAAY;6CAAZ,YAAY;CAkKxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "engines": {
     "node": ">=14.17.0"
   },

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

@@ -233,6 +233,14 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
         description: 'Téléchargement du fichier',
         mimeType: 'x-gis/x-shapefile',
       },
+      {
+        type: 'service',
+        url: new URL('https://my-org.net/ogc'),
+        accessServiceProtocol: 'ogcFeatures',
+        name: 'ogcFeaturesSecondRecord',
+        description: 'This OGC service is the second part of the download',
+        identifierInService: 'my:featuretype',
+      },
     ],
     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.`,

package/src/libs/feature/record/src/lib/state/mdview.facade.ts

@@ -1,6 +1,14 @@
 import { Injectable } from '@angular/core'
 import { select, Store } from '@ngrx/store'
-import { defaultIfEmpty, filter, map, mergeMap, scan } from 'rxjs/operators'
+import {
+  catchError,
+  defaultIfEmpty,
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  toArray,
+} from 'rxjs/operators'
 import * as MdViewActions from './mdview.actions'
 import * as MdViewSelectors from './mdview.selectors'
 import { LinkClassifierService, LinkUsage } from '../../../../../../libs/util/shared/src'
@@ -95,36 +103,39 @@ export class MdViewFacade {
   )
 
   geoDataLinksWithGeometry$ = this.allLinks$.pipe(
-    mergeMap((links) => {
-      return from(links)
-    }),
-    mergeMap((link) => {
-      if (this.linkClassifier.hasUsage(link, LinkUsage.GEODATA)) {
-        if (
-          link.type === 'service' &&
-          link.accessServiceProtocol === 'ogcFeatures'
-        ) {
-          return from(this.dataService.getItemsFromOgcApi(link.url.href)).pipe(
-            map((collectionRecords: OgcApiRecord) => {
-              return collectionRecords && collectionRecords.geometry
-                ? link
-                : null
-            }),
-            defaultIfEmpty(null)
-          )
-        } else {
-          return of(link)
-        }
-      } else {
-        return of(null)
-      }
-    }),
-    scan((acc, val) => {
-      if (val !== null && !acc.includes(val)) {
-        acc.push(val)
-      }
-      return acc
-    }, [])
+    switchMap((links) =>
+      from(links).pipe(
+        mergeMap((link) => {
+          if (this.linkClassifier.hasUsage(link, LinkUsage.GEODATA)) {
+            if (
+              link.type === 'service' &&
+              link.accessServiceProtocol === 'ogcFeatures'
+            ) {
+              return from(
+                this.dataService.getItemsFromOgcApi(link.url.href)
+              ).pipe(
+                map((collectionRecords: OgcApiRecord) => {
+                  return collectionRecords && collectionRecords.geometry
+                    ? link
+                    : null
+                }),
+                defaultIfEmpty(null),
+                catchError((e) => {
+                  console.error(e)
+                  return of(null)
+                })
+              )
+            } else {
+              return of(link)
+            }
+          } else {
+            return of(null)
+          }
+        }),
+        toArray(),
+        map((links) => links.filter((link) => link !== null))
+      )
+    )
   )
 
   landingPageLinks$ = this.metadata$.pipe(