geonetwork-ui 2.4.0-dev.fe59f179 → 2.4.1-dev.1d2ade24e

package/src/libs/ui/widgets/src/lib/ui-widgets.module.ts

@@ -3,24 +3,14 @@ import { UtilSharedModule } from '../../../../../libs/util/shared/src'
 import { TranslateModule } from '@ngx-translate/core'
 import { NgxDropzoneModule } from 'ngx-dropzone'
 import { ColorScaleComponent } from './color-scale/color-scale.component'
-import { ProgressBarComponent } from './progress-bar/progress-bar.component'
 import { StepBarComponent } from './step-bar/step-bar.component'
 import { TagInputModule } from 'ngx-chips'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { LoadingMaskComponent } from './loading-mask/loading-mask.component'
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'
-import { MatIconModule } from '@angular/material/icon'
-import { SpinningLoaderComponent } from './spinning-loader/spinning-loader.component'
 import { CommonModule } from '@angular/common'
 
 @NgModule({
-  declarations: [
-    ColorScaleComponent,
-    ProgressBarComponent,
-    StepBarComponent,
-    LoadingMaskComponent,
-    SpinningLoaderComponent,
-  ],
+  declarations: [ColorScaleComponent, StepBarComponent],
   imports: [
     CommonModule,
     TranslateModule.forChild(),
@@ -30,13 +20,7 @@ import { CommonModule } from '@angular/common'
     TagInputModule,
     UtilSharedModule,
     MatProgressSpinnerModule,
-    MatIconModule,
-  ],
-  exports: [
-    ProgressBarComponent,
-    StepBarComponent,
-    LoadingMaskComponent,
-    SpinningLoaderComponent,
   ],
+  exports: [StepBarComponent],
 })
 export class UiWidgetsModule {}

package/src/libs/util/app-config/src/index.ts

@@ -1,3 +1,4 @@
 export * from './lib/app-config'
 export * from './lib/fixtures'
 export * from './lib/model'
+export * from './lib/map-layers'

package/src/libs/util/app-config/src/lib/app-config.ts

@@ -98,6 +98,7 @@ export function loadAppConfig() {
           'proxy_path',
           'metadata_language',
           'login_url',
+          'logout_url',
           'web_component_embedder_url',
           'languages',
           'contact_email',
@@ -124,6 +125,8 @@ export function loadAppConfig() {
                   ).toLowerCase()
                 : undefined,
               LOGIN_URL: parsedGlobalSection.login_url,
+              LOGOUT_URL: parsedGlobalSection.logout_url,
+              SETTINGS_URL: parsedGlobalSection.settings_url,
               WEB_COMPONENT_EMBEDDER_URL:
                 parsedGlobalSection.web_component_embedder_url,
               LANGUAGES: parsedGlobalSection.languages,
@@ -134,7 +137,7 @@ export function loadAppConfig() {
         parsed,
         'map_layer',
         ['type'],
-        ['name', 'url', 'data'],
+        ['name', 'url', 'data', 'styleUrl', 'accessToken'],
         warnings,
         errors
       )
@@ -146,6 +149,7 @@ export function loadAppConfig() {
           'max_zoom',
           'do_not_tile_wms',
           'max_extent',
+          'max_feature_count',
           'baselayer',
           'do_not_use_default_basemap',
           'external_viewer_url_template',
@@ -161,6 +165,7 @@ export function loadAppConfig() {
               MAX_ZOOM: parsedMapSection.max_zoom,
               DO_NOT_TILE_WMS: parsedMapSection.do_not_tile_wms,
               MAX_EXTENT: parsedMapSection.max_extent,
+              MAX_FEATURE_COUNT: parsedMapSection.max_feature_count,
               EXTERNAL_VIEWER_URL_TEMPLATE:
                 parsedMapSection.external_viewer_url_template,
               EXTERNAL_VIEWER_OPEN_NEW_TAB:
@@ -174,7 +179,9 @@ export function loadAppConfig() {
                     URL: map_layer.url,
                     NAME: map_layer.name,
                     DATA: map_layer.data,
-                  } as LayerConfig)
+                    STYLE_URL: map_layer.styleUrl,
+                    ACCESS_TOKEN: map_layer.accessToken,
+                  }) as LayerConfig
               ),
             } as MapConfig)
 

package/src/libs/util/app-config/src/lib/fixtures.ts

@@ -1,11 +1,12 @@
 import { MapConfig } from './model'
 
-export const CONFIG_OK = `
+export const okAppConfigFixture = () => `
 [global]
 geonetwork4_api_url = "/geonetwork/srv/api"
 proxy_path = "/proxy/?url="
 metadata_language = "fre"
 login_url = "/cas/login?service="
+logout_url = "/geonetwork/signout"
 web_component_embedder_url = "/datahub/wc-embedder.html"
 
 [map]
@@ -63,9 +64,9 @@ my.sample.text = "Un bon exemple de texte."
 "my.quoted.text" = 'du texte entre guillements.'
 `
 
-export const CONFIG_WITH_TRANSLATIONS = CONFIG_OK
+export const appConfigWithTranslationFixture = () => okAppConfigFixture()
 
-export const CONFIG_MINIMAL = `
+export const minimalAppConfigFixture = () => `
 [global]
 geonetwork4_api_url = "/geonetwork/srv/api"
 proxy_path = "/proxy/?url="
@@ -77,7 +78,7 @@ main_color = "#212029" # All-purpose text color
 background_color = "#fdfbff"
 `
 
-export const MAP_CONFIG_FIXTURE: MapConfig = {
+export const mapConfigFixture = (): MapConfig => ({
   MAX_ZOOM: 10,
   MAX_EXTENT: [-418263.418776, 5251529.591305, 961272.067714, 6706890.609855],
   DO_NOT_USE_DEFAULT_BASEMAP: false,
@@ -101,15 +102,15 @@ export const MAP_CONFIG_FIXTURE: MapConfig = {
       NAME: 'some_layername',
     },
   ],
-}
+})
 
-export const CONFIG_MALFORMED = `
+export const malformedConfigFixture = () => `
 {
   "I thought": "we were still doing json"
 }
 `
 
-export const CONFIG_MISSING_MANDATORY = `
+export const missingMandatoryConfigFixture = () => `
 [theme]
 primary_color = "#093564"
 secondary_color = "#c2e9dc"
@@ -117,7 +118,7 @@ background_color = "#fdfbff"
 main_font = 'sans-serif'
 `
 
-export const CONFIG_WRONG_LANGUAGE_CODE = `
+export const wrongLanguageCodeConfigFixture = () => `
 [global]
 geonetwork4_api_url = "/geonetwork/srv/api"
 proxy_path = "/proxy/?url="
@@ -132,7 +133,7 @@ main_color = "#212029" # All-purpose text color
 background_color = "#fdfbff"
 `
 
-export const CONFIG_UNRECOGNIZED_KEYS = `
+export const unrecognizedKeysConfigFixture = () => `
 [global]
 geonetwork4_api_url = "/geonetwork/srv/api"
 proxy_path = "/proxy/?url="

package/src/libs/util/app-config/src/lib/map-layers.ts

@@ -0,0 +1,37 @@
+import { LayerConfig } from './model'
+import { MapContextLayer } from '@geospatial-sdk/core'
+
+export function getMapContextLayerFromConfig(
+  config: LayerConfig
+): MapContextLayer {
+  switch (config.TYPE) {
+    case 'wms':
+      return {
+        type: 'wms',
+        url: config.URL,
+        name: config.NAME,
+      }
+    case 'wfs':
+      return {
+        type: 'wfs',
+        url: config.URL,
+        featureType: config.NAME,
+      }
+    case 'xyz':
+      return {
+        type: config.TYPE,
+        url: config.URL,
+      }
+    case 'geojson':
+      return {
+        type: config.TYPE,
+        ...(config.DATA ? { data: config.DATA } : { url: config.URL }),
+      }
+    case 'maplibre-style':
+      return {
+        type: config.TYPE,
+        styleUrl: config.STYLE_URL,
+        accessToken: config.ACCESS_TOKEN,
+      }
+  }
+}

package/src/libs/util/app-config/src/lib/model.ts

@@ -6,22 +6,27 @@ export interface GlobalConfig {
   PROXY_PATH?: string
   METADATA_LANGUAGE?: string
   LOGIN_URL?: string
+  LOGOUT_URL?: string
+  SETTINGS_URL?: string
   WEB_COMPONENT_EMBEDDER_URL?: string
   LANGUAGES?: string[]
   CONTACT_EMAIL?: string
 }
 
 export interface LayerConfig {
-  TYPE: 'xyz' | 'wms' | 'wfs' | 'geojson'
+  TYPE: 'xyz' | 'wms' | 'wfs' | 'geojson' | 'maplibre-style'
   URL?: string
   NAME?: string
   DATA?: string
+  STYLE_URL?: string
+  ACCESS_TOKEN?: string
 }
 
 export interface MapConfig {
   MAX_ZOOM?: number
   DO_NOT_TILE_WMS: boolean
   MAX_EXTENT?: [number, number, number, number] // Expressed as [minx, miny, maxx, maxy]
+  MAX_FEATURE_COUNT?: number
   EXTERNAL_VIEWER_URL_TEMPLATE?: string
   EXTERNAL_VIEWER_OPEN_NEW_TAB?: boolean
   DO_NOT_USE_DEFAULT_BASEMAP: boolean

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

@@ -48,11 +48,11 @@ export const ExcelMimeTypes = [
 export const GmlMimeTypes = ['application/gml+xml'] as const
 
 export type SupportedMimeType =
-  | typeof CsvMimeTypes[number]
-  | typeof JsonMimeTypes[number]
-  | typeof GeoJsonMimeTypes[number]
-  | typeof ExcelMimeTypes[number]
-  | typeof GmlMimeTypes[number]
+  | (typeof CsvMimeTypes)[number]
+  | (typeof JsonMimeTypes)[number]
+  | (typeof GeoJsonMimeTypes)[number]
+  | (typeof ExcelMimeTypes)[number]
+  | (typeof GmlMimeTypes)[number]
 
 export const SupportedTypes = [
   'csv',
@@ -61,7 +61,7 @@ export const SupportedTypes = [
   'excel',
   'gml',
 ] as const
-export type SupportedType = typeof SupportedTypes[number]
+export type SupportedType = (typeof SupportedTypes)[number]
 
 export const AllMimeTypes = {
   csv: CsvMimeTypes,

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

@@ -28,7 +28,7 @@ export class BaseFileReader extends BaseReader {
       (result) =>
         ({
           itemsCount: result.items.length,
-        } as DatasetInfo)
+        }) as DatasetInfo
     )
   }
 

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

@@ -8,8 +8,8 @@ import {
 } from './model'
 import { sharedFetch, useCache } from '@camptocamp/ogc-client'
 import { parseHeaders } from './headers'
-import parseDate from 'date-fns/parse'
-import parseIsoDate from 'date-fns/parseISO'
+import { parse as parseDate } from 'date-fns/parse'
+import { parseISO as parseIsoDate } from 'date-fns/parseISO'
 
 export async function inferDatasetType(
   url: string,
@@ -89,20 +89,22 @@ export function fetchDataAsArrayBuffer(url: string): Promise<ArrayBuffer> {
   })
 }
 
-export function tryParseDate(input: string): Date | null {
-  function tryIso() {
-    const parsed = parseIsoDate(input)
+export function tryParseDate(input: unknown): Date | null {
+  if (typeof input !== 'string') return null
+
+  function tryIso(value: string) {
+    const parsed = parseIsoDate(value)
     return isNaN(parsed.getDate()) ? null : parsed
   }
-  function tryFormat(format: string) {
-    const parsed = parseDate(input, format, new Date())
+  function tryFormat(value: string, format: string) {
+    const parsed = parseDate(value, format, new Date())
     return isNaN(parsed.getDate()) ? null : parsed
   }
   return (
-    tryIso() ||
-    tryFormat('dd/MM/yyyy') ||
-    tryFormat('dd.MM.yyyy') ||
-    tryFormat('MM/dd/yyyy') ||
+    tryIso(input) ||
+    tryFormat(input, 'dd/MM/yyyy') ||
+    tryFormat(input, 'dd.MM.yyyy') ||
+    tryFormat(input, 'MM/dd/yyyy') ||
     null
   )
 }

package/src/libs/util/i18n/src/index.ts

@@ -5,3 +5,4 @@ export * from './lib/lang.service'
 export * from './lib/file.translate.loader'
 export * from './lib/embedded.translate.loader'
 export * from './lib/translate.loader.utils'
+export * from './lib/language-codes'

package/src/libs/util/i18n/src/lib/i18n.constants.ts

@@ -22,52 +22,9 @@ marker('language.sk')
 
 export const DEFAULT_LANG = 'en'
 
-export const LANG_3_TO_2_MAPPER = {
-  eng: 'en',
-  dut: 'nl',
-  fre: 'fr',
-  ger: 'de',
-  kor: 'ko',
-  spa: 'es',
-  cze: 'cs',
-  cat: 'ca',
-  fin: 'fi',
-  ice: 'is',
-  ita: 'it',
-  por: 'pt',
-  rus: 'ru',
-  chi: 'zh',
-  slo: 'sk',
-}
-
-export const LANGUAGE_NAMES = {
-  en: 'English',
-  nl: 'Nederlands',
-  fr: 'Français',
-  de: 'Deutsch',
-  ko: '한국어',
-  es: 'Español',
-  cs: 'Čeština',
-  ca: 'Català',
-  fi: 'Suomi',
-  is: 'Íslenska',
-  it: 'Italiano',
-  pt: 'Português',
-  ru: 'Русский',
-  zh: '中文',
-  sk: 'Slovenčina',
-}
-
 // Caution: changing this can break language selection from third parties!
 export const LANGUAGE_STORAGE_KEY = 'geonetwork-ui-language'
 
-export const LANG_2_TO_3_MAPPER = Object.entries(LANG_3_TO_2_MAPPER).reduce(
-  (mapperObject, langEntry) => {
-    return { ...mapperObject, [langEntry[1]]: langEntry[0] }
-  },
-  {}
-)
-
 export function HttpLoaderFactory(http: HttpClient) {
   return new FileTranslateLoader(http, './assets/i18n/')
 }

package/src/libs/util/i18n/src/lib/lang.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { LANG_2_TO_3_MAPPER } from './i18n.constants'
+import { LANG_2_TO_3_MAPPER } from './language-codes'
 import { TranslateService } from '@ngx-translate/core'
 
 @Injectable({

package/src/libs/util/i18n/src/lib/language-codes.ts

@@ -0,0 +1,44 @@
+export const LANG_3_TO_2_MAPPER = {
+  eng: 'en',
+  dut: 'nl',
+  fre: 'fr',
+  ger: 'de',
+  kor: 'ko',
+  spa: 'es',
+  cze: 'cs',
+  cat: 'ca',
+  fin: 'fi',
+  ice: 'is',
+  ita: 'it',
+  por: 'pt',
+  rus: 'ru',
+  chi: 'zh',
+  slo: 'sk',
+  roh: 'rm',
+}
+
+export const LANGUAGE_NAMES = {
+  en: 'English',
+  nl: 'Nederlands',
+  fr: 'Français',
+  de: 'Deutsch',
+  ko: '한국어',
+  es: 'Español',
+  cs: 'Čeština',
+  ca: 'Català',
+  fi: 'Suomi',
+  is: 'Íslenska',
+  it: 'Italiano',
+  pt: 'Português',
+  ru: 'Русский',
+  zh: '中文',
+  sk: 'Slovenčina',
+  roh: 'Rumantsch',
+}
+
+export const LANG_2_TO_3_MAPPER = Object.entries(LANG_3_TO_2_MAPPER).reduce(
+  (mapperObject, langEntry) => {
+    return { ...mapperObject, [langEntry[1]]: langEntry[0] }
+  },
+  {}
+)

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

@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { getFileFormat } from './link-utils'
+
 export enum LinkUsage {
   API = 'api',
   MAP_API = 'mapapi',
@@ -15,7 +16,7 @@ export enum LinkUsage {
   providedIn: 'root',
 })
 export class LinkClassifierService {
-  getUsagesForLink(link: DatasetDistribution): LinkUsage[] {
+  getUsagesForLink(link: DatasetOnlineResource): LinkUsage[] {
     switch (link.type) {
       case 'service': {
         switch (link.accessServiceProtocol) {
@@ -27,6 +28,8 @@ export class LinkClassifierService {
             return [LinkUsage.API, LinkUsage.MAP_API]
           case 'ogcFeatures':
             return [LinkUsage.API, LinkUsage.DOWNLOAD, LinkUsage.GEODATA]
+          case 'GPFDL':
+            return [LinkUsage.API]
           default:
             return [LinkUsage.UNKNOWN]
         }
@@ -51,7 +54,7 @@ export class LinkClassifierService {
     }
   }
 
-  hasUsage(link: DatasetDistribution, usage: LinkUsage) {
+  hasUsage(link: DatasetOnlineResource, usage: LinkUsage) {
     return this.getUsagesForLink(link).indexOf(usage) > -1
   }
 }