geonetwork-ui 2.6.0-dev.01d2b5fc0 → 2.6.0-dev.4fa0a0afc

package/src/libs/ui/map/src/lib/components/map-legend/map-legend.component.ts

@@ -33,6 +33,9 @@ export class MapLegendComponent implements OnChanges {
         if (this.legendHTML) {
           this.legendStatusChange.emit(true)
         }
+      } else {
+        this.legendHTML = false
+        this.legendStatusChange.emit(false)
       }
     }
   }

package/src/libs/util/data-fetcher/src/lib/data-fetcher.ts

@@ -53,7 +53,9 @@ export async function openDataset(
     reader.load()
     return reader
   } catch (e: any) {
-    throw FetchError.parsingFailed(e.message)
+    //WfsReader may already raise a FetchError
+    if (e instanceof FetchError) throw e
+    else throw FetchError.parsingFailed(e.message)
   }
 }
 

package/src/libs/util/data-fetcher/src/lib/model.ts

@@ -7,7 +7,14 @@ export class FetchError {
   stack = null
 
   constructor(
-    public type: 'http' | 'network' | 'parse' | 'unsupportedType' | 'unknown',
+    public type:
+      | 'http'
+      | 'forbidden'
+      | 'network'
+      | 'parse'
+      | 'unsupportedType'
+      | 'unknown',
+
     public info: string,
     public httpStatus = 0
   ) {
@@ -20,6 +27,9 @@ ${body}`
       : `${code}`
     return new FetchError('http', info, code)
   }
+  static forbidden(code: number) {
+    return new FetchError('forbidden', '', code)
+  }
   static corsOrNetwork(message: string) {
     return new FetchError('network', message, 0)
   }

package/src/libs/util/data-fetcher/src/lib/readers/wfs.ts

@@ -1,5 +1,5 @@
-import { WfsEndpoint, WfsVersion } from '@camptocamp/ogc-client'
-import { DataItem, DatasetInfo, PropertyInfo } from '../model'
+import { EndpointError, WfsEndpoint, WfsVersion } from '@camptocamp/ogc-client'
+import { DataItem, DatasetInfo, FetchError, PropertyInfo } from '../model'
 import { fetchDataAsText } from '../utils'
 import { GmlReader, parseGml } from './gml'
 import { GeojsonReader, parseGeojson } from './geojson'
@@ -7,6 +7,32 @@ import { BaseCacheReader } from './base-cache'
 import { getJsonDataItemsProxy, jsonToGeojsonFeature } from '../utils'
 import { generateSqlQuery } from '../sql-utils'
 
+export async function getWfsEndpoint(wfsUrl: string): Promise<WfsEndpoint> {
+  try {
+    return await new WfsEndpoint(wfsUrl).isReady()
+  } catch (e) {
+    if (
+      e instanceof Error &&
+      'isCrossOriginRelated' in e &&
+      'httpStatus' in e
+    ) {
+      const error = e as EndpointError
+      if (error.isCrossOriginRelated === true) {
+        throw new Error(`wfs.unreachable.cors`)
+      }
+      if (error.httpStatus === 401 || error.httpStatus === 403) {
+        throw FetchError.forbidden(error.httpStatus)
+      } else if (error.httpStatus === 400 || error.httpStatus > 403) {
+        throw FetchError.http(error.httpStatus)
+      } else {
+        throw FetchError.unknownType()
+      }
+    } else {
+      throw FetchError.unknownType()
+    }
+  }
+}
+
 export class WfsReader extends BaseCacheReader {
   endpoint: WfsEndpoint
   featureTypeName: string
@@ -53,7 +79,7 @@ export class WfsReader extends BaseCacheReader {
   }
 
   static async createReader(wfsUrlEndpoint: string, featureTypeName?: string) {
-    const wfsEndpoint = await new WfsEndpoint(wfsUrlEndpoint).isReady()
+    const wfsEndpoint = await getWfsEndpoint(wfsUrlEndpoint)
     const featureTypes = wfsEndpoint.getFeatureTypes()
     const featureType = wfsEndpoint.getFeatureTypeSummary(
       featureTypes.length === 1 && !featureTypeName

package/src/libs/util/shared/src/lib/links/link-utils.ts

@@ -16,7 +16,7 @@ export const FORMATS = {
   csv: {
     extensions: ['csv'],
     priority: 1,
-    color: '#a6d6c0',
+    color: '#F6A924',
     mimeTypes: ['text/csv', 'application/csv'],
   },
   excel: {
@@ -28,7 +28,7 @@ export const FORMATS = {
       'openxmlformats-officedocument',
     ],
     priority: 2,
-    color: '#acc5e4',
+    color: '#FFDE10',
     mimeTypes: [
       'application/vnd.ms-excel',
       'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
@@ -37,31 +37,31 @@ export const FORMATS = {
   geojson: {
     extensions: ['geojson'],
     priority: 3,
-    color: '#b3cde8',
+    color: '#293C6F',
     mimeTypes: ['application/geo+json', 'application/vnd.geo+json'],
   },
   json: {
     extensions: ['json'],
     priority: 3,
-    color: '#b3cde8',
+    color: '#84D0F0',
     mimeTypes: ['application/json'],
   },
   shp: {
     extensions: ['shp', 'shape', 'zipped-shapefile'],
     priority: 4,
-    color: '#b2d8ba',
+    color: '#009036',
     mimeTypes: ['x-gis/x-shapefile'],
   },
   gml: {
     extensions: ['gml'],
     priority: 5,
-    color: '#e3b3e5',
+    color: '#E75113',
     mimeTypes: ['application/gml+xml', 'text/xml; subtype=gml'],
   },
   kml: {
     extensions: ['kml', 'kmz'],
     priority: 6,
-    color: '#c1e6a0',
+    color: '#F4B5D0',
     mimeTypes: [
       'application/vnd.google-earth.kml+xml',
       'application/vnd.google-earth.kmz',
@@ -70,55 +70,55 @@ export const FORMATS = {
   gpkg: {
     extensions: ['gpkg', 'geopackage'],
     priority: 7,
-    color: '#f7cce6',
+    color: '#7D5D9F',
     mimeTypes: ['application/geopackage+sqlite3'],
   },
   zip: {
     extensions: ['zip', 'tar.gz'],
     priority: 8,
-    color: '#ffe7a3',
+    color: '#B0CB52',
     mimeTypes: ['application/zip', 'application/x-zip'],
   },
   pdf: {
     extensions: ['pdf'],
     priority: 9,
-    color: '#f5b2a3',
+    color: '#49579E',
     mimeTypes: ['application/pdf'],
   },
   jpg: {
     extensions: ['jpg', 'jpeg', 'jfif', 'pjpeg', 'pjp'],
     priority: 9,
-    color: '#d1c1e9',
+    color: '#C4A98F',
     mimeTypes: ['image/jpg'],
   },
   svg: {
     extensions: ['svg'],
     priority: 10,
-    color: '#f3c1c9',
+    color: '#EB6D82',
     mimeTypes: ['image/svg+xml'],
   },
   dxf: {
     extensions: ['dxf'],
     priority: 11,
-    color: '#f6ceac',
+    color: '#DCCD00',
     mimeTypes: ['application/x-dxf', 'image/x-dxf'],
   },
   html: {
     extensions: ['html', 'htm'],
     priority: 12,
-    color: '#FFF2CC',
+    color: '#C0C9B6',
     mimeTypes: ['text/html'],
   },
   fgb: {
     extensions: ['fgb', 'flatgeobuf'],
     priority: 13,
-    color: '#ffe7a3',
+    color: '#A8111C',
     mimeTypes: ['application/flatgeobuf'],
   },
   jsonfg: {
     extensions: ['jsonfg', 'jsonfgc'],
     priority: 14,
-    color: '#ffe7a3',
+    color: '#009EE0',
     mimeTypes: [
       'application/vnd.ogc.fg+json',
       'application/vnd.ogc.fg+json;compatibility=geojson',
@@ -207,9 +207,11 @@ export function checkFileFormat(
   format: FileFormat
 ): boolean {
   return (
-    ('name' in link && new RegExp(`[./]${format}`, 'i').test(link.name)) ||
+    ('name' in link &&
+      new RegExp(`[./]${format}`, 'i').test(link.name.toLowerCase())) ||
     ('url' in link &&
-      new RegExp(`[./]${format}`, 'i').test(link.url.toString()))
+      new RegExp(`[./]${format}`, 'i').test(link.url.toString())) ||
+    ('name' in link && link.name.toLowerCase().includes(format))
   )
 }
 

package/tailwind.base.css

@@ -129,6 +129,34 @@
       border border-white focus:ring-4 focus:ring-gray-300;
   }
 
+  .gn-ui-card-xs {
+    @apply min-h-[68px] md:w-[487px];
+  }
+
+  .gn-ui-card-s {
+    @apply min-h-[135px] md:w-80;
+  }
+
+  .gn-ui-card-m {
+    @apply min-h-[68px] md:w-[487px];
+  }
+
+  .gn-ui-card-l {
+    @apply min-h-[68px] md:w-[992px];
+  }
+
+  .gn-ui-card-title {
+    @apply font-title font-medium text-black text-ellipsis overflow-hidden break-words line-clamp-3;
+  }
+
+  .gn-ui-card-icon {
+    @apply flex border border-gray-300 rounded-lg py-1 px-2 align-middle;
+  }
+
+  .gn-ui-card-detail {
+    @apply font-medium text-gray-500 text-ellipsis break-words text-sm;
+  }
+
   /* DROPDOWN MULTISELECT CLASS */
   .gn-ui-multiselect-counter {
     --text-color: var(--gn-ui-multiselect-counter-text-color, white);
@@ -186,7 +214,7 @@
 
   /* TODO: add prefix */
   .card-icon {
-    @apply text-primary opacity-50 group-hover:text-secondary group-hover:opacity-100 transition-colors transition-opacity;
+    @apply text-black group-hover:text-primary-darkest transition-colors;
   }
 
   /* makes spinners appear in the right color */

package/translations/de.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "Generiert durch eine API",
   "datahub.search.filter.generatedByWfs": "",
   "datahub.search.filter.others": "Andere",
+  "dataset.error.forbidden": "Der Zugriff auf diese Ressource ist eingeschränkt",
   "dataset.error.http": "Die Daten konnten aufgrund eines HTTP-Fehlers nicht geladen werden: \"{ info }\"",
   "dataset.error.network": "Die Daten konnten aufgrund eines Netzwerkfehlers oder CORS-Beschränkungen nicht geladen werden: \"{ info }\"",
   "dataset.error.parse": "Die Daten wurden geladen, konnten aber nicht gelesen werden: \"{ info }\"",

package/translations/en.json

@@ -66,8 +66,9 @@
   "datahub.search.back": "Back",
   "datahub.search.filter.all": "All",
   "datahub.search.filter.generatedByAPI": "Generated by an API",
-  "datahub.search.filter.generatedByWfs": "",
+  "datahub.search.filter.generatedByWfs": "Generated by a WFS",
   "datahub.search.filter.others": "Others",
+  "dataset.error.forbidden": "Access to this resource is restricted",
   "dataset.error.http": "The data could not be loaded because of an HTTP error: \"{ info }\"",
   "dataset.error.network": "The data could not be loaded because of a network error or CORS limitations: \"{ info }\"",
   "dataset.error.parse": "The data was loaded but could not be parsed: \"{ info }\"",

package/translations/es.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "",
   "datahub.search.filter.generatedByWfs": "",
   "datahub.search.filter.others": "",
+  "dataset.error.forbidden": "El acceso a este recurso está restringido",
   "dataset.error.http": "",
   "dataset.error.network": "",
   "dataset.error.parse": "",

package/translations/fr.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "généré par une API",
   "datahub.search.filter.generatedByWfs": "généré par un WFS",
   "datahub.search.filter.others": "Autres",
+  "dataset.error.forbidden": "L’accès à cette ressource est restreint",
   "dataset.error.http": "Le chargement des données a échoué en raison d'une erreur HTTP: \"{ info }\"",
   "dataset.error.network": "Le chargement des données a échoué en raison d'une erreur réseau ou de limitations CORS: \"{ info }\"",
   "dataset.error.parse": "Les données ont été chargées mais leur décodage a échoué: \"{ info }\"",

package/translations/it.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "generato da un'API",
   "datahub.search.filter.generatedByWfs": "generato da un WFS",
   "datahub.search.filter.others": "Altri",
+  "dataset.error.forbidden": "L'accesso a questa risorsa è limitato",
   "dataset.error.http": "Il caricamento dei dati non è riuscito a causa di un errore HTTP: \"{info}\"",
   "dataset.error.network": "Il caricamento dei dati non è riuscito a causa di un errore di rete o di limitazioni CORS: \"{info}\"",
   "dataset.error.parse": "I dati sono stati caricati ma la decodifica non è riuscita: \"{info}\"",

package/translations/nl.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "",
   "datahub.search.filter.generatedByWfs": "",
   "datahub.search.filter.others": "",
+  "dataset.error.forbidden": "",
   "dataset.error.http": "",
   "dataset.error.network": "",
   "dataset.error.parse": "",

package/translations/pt.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "",
   "datahub.search.filter.generatedByWfs": "",
   "datahub.search.filter.others": "",
+  "dataset.error.forbidden": "",
   "dataset.error.http": "",
   "dataset.error.network": "",
   "dataset.error.parse": "",

package/translations/sk.json

@@ -68,6 +68,7 @@
   "datahub.search.filter.generatedByAPI": "vygenerované cez API",
   "datahub.search.filter.generatedByWfs": "",
   "datahub.search.filter.others": "Iné",
+  "dataset.error.forbidden": "",
   "dataset.error.http": "Dáta sa nedajú načítať kvôli chybe HTTP: \"{ info }\"",
   "dataset.error.network": "Dáta sa nedajú načítať kvôli chybe v sieti alebo obmedzeniam CORS: \"{ info }\"",
   "dataset.error.parse": "Dáta boli načítané, ale nedajú sa analyzovať: \"{ info }\"",