geonetwork-ui 2.4.0-dev.fdf8f64b → 2.4.1-dev.73bac9979

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

@@ -28,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]
         }

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

@@ -7,7 +7,7 @@ export const FORMATS = {
   csv: {
     extensions: ['csv'],
     priority: 1,
-    color: '#559d7f',
+    color: '#a6d6c0',
     mimeTypes: ['text/csv', 'application/csv'],
   },
   excel: {
@@ -19,7 +19,7 @@ export const FORMATS = {
       'openxmlformats-officedocument',
     ],
     priority: 2,
-    color: '#0f4395',
+    color: '#acc5e4',
     mimeTypes: [
       'application/vnd.ms-excel',
       'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
@@ -28,31 +28,31 @@ export const FORMATS = {
   geojson: {
     extensions: ['geojson'],
     priority: 3,
-    color: '#1e5180',
+    color: '#b3cde8',
     mimeTypes: ['application/geo+json', 'application/vnd.geo+json'],
   },
   json: {
     extensions: ['json'],
     priority: 3,
-    color: '#1e5180',
+    color: '#b3cde8',
     mimeTypes: ['application/json'],
   },
   shp: {
     extensions: ['shp', 'shape', 'zipped-shapefile'],
     priority: 4,
-    color: '#328556',
+    color: '#b2d8ba',
     mimeTypes: ['x-gis/x-shapefile'],
   },
   gml: {
     extensions: ['gml'],
     priority: 5,
-    color: '#c92bce',
+    color: '#e3b3e5',
     mimeTypes: ['application/gml+xml', 'text/xml; subtype=gml'],
   },
   kml: {
     extensions: ['kml', 'kmz'],
     priority: 6,
-    color: '#348009',
+    color: '#c1e6a0',
     mimeTypes: [
       'application/vnd.google-earth.kml+xml',
       'application/vnd.google-earth.kmz',
@@ -61,55 +61,55 @@ export const FORMATS = {
   gpkg: {
     extensions: ['gpkg', 'geopackage'],
     priority: 7,
-    color: '#ea79ba',
+    color: '#f7cce6',
     mimeTypes: ['application/geopackage+sqlite3'],
   },
   zip: {
     extensions: ['zip', 'tar.gz'],
     priority: 8,
-    color: '#f2bb3a',
+    color: '#ffe7a3',
     mimeTypes: ['application/zip', 'application/x-zip'],
   },
   pdf: {
     extensions: ['pdf'],
     priority: 9,
-    color: '#db544a',
+    color: '#f5b2a3',
     mimeTypes: ['application/pdf'],
   },
   jpg: {
     extensions: ['jpg', 'jpeg', 'jfif', 'pjpeg', 'pjp'],
     priority: 9,
-    color: '#673ab7',
+    color: '#d1c1e9',
     mimeTypes: ['image/jpg'],
   },
   svg: {
     extensions: ['svg'],
     priority: 10,
-    color: '#d98294',
+    color: '#f3c1c9',
     mimeTypes: ['image/svg+xml'],
   },
   dxf: {
     extensions: ['dxf'],
     priority: 11,
-    color: '#de630b',
+    color: '#f6ceac',
     mimeTypes: ['application/x-dxf', 'image/x-dxf'],
   },
   html: {
     extensions: ['html', 'htm'],
     priority: 12,
-    color: '#f2bb3a',
+    color: '#FFF2CC',
     mimeTypes: ['text/html'],
   },
   fgb: {
     extensions: ['fgb', 'flatgeobuf'],
     priority: 13,
-    color: '#f2bb3a',
+    color: '#ffe7a3',
     mimeTypes: ['application/flatgeobuf'],
   },
   jsonfg: {
     extensions: ['jsonfg', 'jsonfgc'],
     priority: 14,
-    color: '#f2bb3a',
+    color: '#ffe7a3',
     mimeTypes: [
       'application/vnd.ogc.fg+json',
       'application/vnd.ogc.fg+json;compatibility=geojson',
@@ -138,7 +138,7 @@ export function getLinkPriority(link: DatasetOnlineResource): number {
 export function getFileFormatFromServiceOutput(
   serviceOutput: string
 ): FileFormat | null {
-  function formatMatcher(format: typeof FORMATS[FileFormat]): boolean {
+  function formatMatcher(format: (typeof FORMATS)[FileFormat]): boolean {
     const output = serviceOutput.toLowerCase()
     return (
       format.extensions.some((extension: string) =>

package/src/libs/util/shared/src/lib/services/proxy.service.ts

@@ -1,4 +1,5 @@
 import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'
+import { Location } from '@angular/common'
 
 export const PROXY_PATH = new InjectionToken<string>('proxyPath')
 
@@ -6,7 +7,10 @@ export const PROXY_PATH = new InjectionToken<string>('proxyPath')
   providedIn: 'root',
 })
 export class ProxyService {
-  constructor(@Optional() @Inject(PROXY_PATH) private proxyPath: string) {}
+  constructor(
+    @Optional() @Inject(PROXY_PATH) private proxyPath: string,
+    private location: Location
+  ) {}
 
   /**
    * Transforms the URL to go through a proxy specified with the PROXY_PATH
@@ -16,7 +20,7 @@ export class ProxyService {
   getProxiedUrl(url: string): string {
     if (!this.proxyPath) return url
     const urlObj = new URL(url)
-    const current = window.location
+    const current = new URL(this.location.path(), window.location.href)
     const proxyUrl = new URL(this.proxyPath, current.toString()).toString()
     if (
       current.hostname === urlObj.hostname &&
@@ -28,7 +32,7 @@ export class ProxyService {
     if (url.indexOf(proxyUrl) === 0) return url
     return new URL(
       `${this.proxyPath}${encodeURIComponent(url)}`,
-      window.location.toString()
+      window.location.href
     ).toString()
   }
 }

package/src/libs/util/shared/src/lib/utils/format-fields.ts

@@ -0,0 +1,11 @@
+export function formatUserInfo(
+  userInfo: string | unknown,
+  displayCount = false
+): string {
+  const infos = (typeof userInfo === 'string' ? userInfo : '').split('|')
+  const count = displayCount ? ` ${infos[3].split(' ')[1]}` : ''
+  if (infos && infos.length === 4) {
+    return `${infos[2]} ${infos[1]}${count}`
+  }
+  return undefined
+}

package/src/libs/util/shared/src/lib/utils/index.ts

@@ -1,8 +1,10 @@
 export * from './bytes-convert'
 export * from './event'
+export * from './format-fields'
 export * from './fuzzy-filter'
 export * from './geojson'
 export * from './image-resize'
+export * from './no-duplicate-file-name'
 export * from './parse'
 export * from './remove-whitespace'
 export * from './sort-by'

package/src/libs/util/shared/src/lib/utils/no-duplicate-file-name.ts

@@ -0,0 +1,23 @@
+export function noDuplicateFileName(
+  fileName: string,
+  fileNameList: string[]
+): string {
+  if (fileNameList.includes(fileName)) {
+    const fileNameParts = fileName.split('.')
+    let extension = ''
+    let baseName = fileName
+
+    if (fileNameParts.length > 1) {
+      extension = fileNameParts.pop() as string
+      baseName = fileNameParts.join('.')
+    }
+
+    if (extension) {
+      fileName = `${baseName}_${Date.now()}.${extension}`
+    } else {
+      fileName = `${baseName}_${Date.now()}`
+    }
+  }
+
+  return fileName
+}

package/src/libs/util/shared/src/lib/utils/temporal-extent-union.ts

@@ -1,4 +1,9 @@
-export function getTemporalRangeUnion(ranges) {
+export function getTemporalRangeUnion(
+  ranges: {
+    start?: Date
+    end?: Date
+  }[]
+) {
   let earliestStartDate = Infinity
   let latestEndDate = -Infinity
   if (ranges.length) {

package/tailwind.base.css

@@ -81,9 +81,9 @@
       focus:z-10 active:z-10 hover:z-10;
   }
   /* makes sure icons will not make the buttons grow vertically */
-  .gn-ui-btn mat-icon.mat-icon {
-    margin-top: -0.325em;
-    margin-bottom: -0.325em;
+  .gn-ui-btn ng-icon {
+    margin-top: -0.5em;
+    margin-bottom: -0.5em;
     flex-shrink: 0;
   }
 
@@ -129,24 +129,35 @@
       border border-white focus:ring-4 focus:ring-gray-300;
   }
 
+  /* DROPDOWN MULTISELECT CLASS */
+  .gn-ui-multiselect-counter {
+    --text-color: var(--gn-ui-multiselect-counter-text-color, white);
+    --background-color: var(
+      --gn-ui-multiselect-counter-background-color,
+      var(--color-primary-lightest)
+    );
+    @apply bg-[color:--background-color] text-[color:--text-color];
+  }
+
   /* BADGE CLASS */
   .gn-ui-badge {
     --rounded: var(--gn-ui-badge-rounded, 0.25em);
     --padding: var(--gn-ui-badge-padding, 0.375em 0.75em);
+    --font-weight: var(--gn-ui-badge-font-weight, 500);
     --text-size: var(--gn-ui-badge-text-size, 0.875em);
     --text-color: var(--gn-ui-badge-text-color, var(--color-gray-50));
     --background-color: var(--gn-ui-badge-background-color, black);
     --opacity: var(--gn-ui-badge-opacity, 0.7);
     @apply opacity-[--opacity] p-[--padding] rounded-[--rounded]
-      font-medium text-[length:--text-size] text-[color:--text-color] bg-[color:--background-color] flex justify-center items-center content-center;
+      font-[--font-weight] text-[length:--text-size] text-[color:--text-color] bg-[color:--background-color] flex justify-center items-center content-center;
   }
   /* makes sure icons will not make the badges grow vertically; also make size proportional */
-  .gn-ui-badge mat-icon.mat-icon {
+  .gn-ui-badge ng-icon {
     margin-top: -0.325em;
     margin-bottom: -0.325em;
     flex-shrink: 0;
     vertical-align: middle;
-    font-size: 1.4em;
+    font-size: 1.1em;
     width: 1em;
     height: 1em;
   }