geonetwork-ui 2.2.0-dev.f866474c → 2.3.0-dev.179fba83

package/src/libs/ui/layout/src/lib/interactive-table/interactive-table.component.css

@@ -0,0 +1,15 @@
+.sort-button mat-icon {
+  padding: 0;
+  margin: 0;
+  height: 8px;
+  line-height: 8px;
+  font-size: 18px;
+}
+
+.table-header-cell {
+  @apply text-gray-700 px-4 py-5 flex items-center truncate bg-white;
+}
+
+button.table-header-cell {
+  @apply transition-colors duration-75 hover:text-main hover:bg-gray-50 focus:text-main focus:bg-gray-50;
+}

package/src/libs/ui/layout/src/lib/interactive-table/interactive-table.component.html

@@ -0,0 +1,54 @@
+<div class="grid w-full" [ngStyle]="gridStyle">
+  <div class="contents">
+    <ng-container *ngFor="let column of columns">
+      <button
+        *ngIf="column.sortable"
+        type="button"
+        class="table-header-cell"
+        (click)="column.sortable && column.handleSortChange()"
+      >
+        <ng-container *ngTemplateOutlet="column.header"></ng-container>
+        <div class="sort-button flex flex-col" *ngIf="column.sortable">
+          <mat-icon
+            class="material-symbols-outlined text-gray-600"
+            [ngClass]="{ 'text-main': column.activeSort === 'asc' }"
+            >expand_less</mat-icon
+          >
+          <mat-icon
+            class="material-symbols-outlined text-gray-600"
+            [ngClass]="{ 'text-main': column.activeSort === 'desc' }"
+            >expand_more</mat-icon
+          >
+        </div>
+      </button>
+      <div *ngIf="!column.sortable" class="table-header-cell">
+        <ng-container *ngTemplateOutlet="column.header"></ng-container>
+      </div>
+    </ng-container>
+  </div>
+  <div
+    class="contents text-gray-900 cursor-pointer group"
+    *ngFor="let item of items"
+    (click)="handleRowClick(item)"
+  >
+    <div
+      class="relative h-0"
+      [ngStyle]="{ 'grid-column': 'span ' + this.columns.length }"
+    >
+      <!-- this element is only used in keyboard navigation -->
+      <button
+        type="button"
+        class="absolute inset-x-0 h-[50px] bg-transparent pointer-events-none"
+      ></button>
+    </div>
+    <ng-container *ngFor="let column of columns">
+      <div
+        class="table-row-cell px-4 py-3 flex items-center bg-white transition-colors duration-75 truncate group-hover:text-main group-hover:bg-gray-50 border-b border-gray-200"
+      >
+        <ng-container
+          *ngTemplateOutlet="column.cell; context: { $implicit: item }"
+        ></ng-container>
+      </div>
+    </ng-container>
+  </div>
+</div>

package/src/libs/ui/layout/src/lib/interactive-table/interactive-table.component.ts

@@ -0,0 +1,42 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ContentChildren,
+  EventEmitter,
+  Input,
+  Output,
+  QueryList,
+} from '@angular/core'
+import { InteractiveTableColumnComponent } from './interactive-table-column/interactive-table-column.component'
+import { CommonModule } from '@angular/common'
+import { MatIconModule } from '@angular/material/icon'
+
+@Component({
+  selector: 'gn-ui-interactive-table',
+  templateUrl: './interactive-table.component.html',
+  styleUrls: ['./interactive-table.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, InteractiveTableColumnComponent, MatIconModule],
+})
+export class InteractiveTableComponent {
+  @ContentChildren(InteractiveTableColumnComponent)
+  columns: QueryList<InteractiveTableColumnComponent>
+
+  @Input() items: unknown[] = []
+  @Output() itemClick = new EventEmitter<unknown>()
+
+  get gridStyle() {
+    return {
+      'grid-template-columns': this.columns
+        .map((column) =>
+          column.grow ? `minmax(0px,1fr)` : `minmax(0px,max-content)`
+        )
+        .join(' '),
+    }
+  }
+
+  handleRowClick(item: unknown) {
+    this.itemClick.emit(item)
+  }
+}

package/src/libs/ui/search/src/index.ts

@@ -14,7 +14,6 @@ export * from './lib/record-preview-card/record-preview-card.component'
 export * from './lib/record-preview-list/record-preview-list.component'
 export * from './lib/record-preview-text/record-preview-text.component'
 export * from './lib/record-preview-title/record-preview-title.component'
-export * from './lib/record-table/record-table.component'
 export * from './lib/record-metric/record-metric.component'
 export * from './lib/results-list-item/results-list-item.component'
 export * from './lib/results-hits-number/results-hits-number.component'

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

@@ -24,10 +24,10 @@ import { ResultsListItemComponent } from './results-list-item/results-list-item.
 import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
 import { UiElementsModule } from '../../../../../libs/ui/elements/src'
 import { RecordPreviewFeedComponent } from './record-preview-feed/record-preview-feed.component'
-import { RecordTableComponent } from './record-table/record-table.component'
 import { CommonModule } from '@angular/common'
 import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
 import { MatCheckboxModule } from '@angular/material/checkbox'
+import { InteractiveTableComponent } from '../../../../../libs/ui/layout/src'
 
 @NgModule({
   declarations: [
@@ -42,7 +42,6 @@ import { MatCheckboxModule } from '@angular/material/checkbox'
     ResultsListItemComponent,
     RecordPreviewFeedComponent,
     RecordPreviewRowComponent,
-    RecordTableComponent,
   ],
   imports: [
     CommonModule,
@@ -59,6 +58,7 @@ import { MatCheckboxModule } from '@angular/material/checkbox'
     MatIconModule,
     MatCheckboxModule,
     RouterLink,
+    InteractiveTableComponent,
   ],
   exports: [
     RecordPreviewListComponent,
@@ -72,7 +72,6 @@ import { MatCheckboxModule } from '@angular/material/checkbox'
     ResultsHitsNumberComponent,
     RecordPreviewFeedComponent,
     RecordPreviewRowComponent,
-    RecordTableComponent,
   ],
   providers: [
     { provide: RESULTS_LAYOUT_CONFIG, useValue: DEFAULT_RESULTS_LAYOUT_CONFIG },

package/src/libs/ui/widgets/src/lib/badge/badge.component.html

@@ -1,7 +1,9 @@
 <div
   class="inline-block bg-black opacity-70 py-1.5 px-3 rounded font-medium text-gray-50 text-sm leading-none"
   [ngClass]="
-    clickable ? 'hover:bg-gray-800 cursor-pointer transition-colors' : ''
+    clickable
+      ? 'hover:bg-primary cursor-pointer transition-colors duration-100'
+      : ''
   "
 >
   <ng-content></ng-content>

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

@@ -3,6 +3,5 @@ export * from './lib/i18n.constants'
 export * from './lib/i18n.interceptor'
 export * from './lib/lang.service'
 export * from './lib/file.translate.loader'
-export * from './lib/testing/test.translate.module'
 export * from './lib/embedded.translate.loader'
 export * from './lib/translate.loader.utils'

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

@@ -40,6 +40,24 @@ export const LANG_3_TO_2_MAPPER = {
   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'
 

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

@@ -43,9 +43,15 @@ export const FORMATS = {
     color: '#328556',
     mimeTypes: ['x-gis/x-shapefile'],
   },
+  gml: {
+    extensions: ['gml'],
+    priority: 5,
+    color: '#c92bce',
+    mimeTypes: ['application/gml+xml', 'text/xml; subtype=gml'],
+  },
   kml: {
     extensions: ['kml', 'kmz'],
-    priority: 5,
+    priority: 6,
     color: '#348009',
     mimeTypes: [
       'application/vnd.google-earth.kml+xml',
@@ -54,34 +60,40 @@ export const FORMATS = {
   },
   gpkg: {
     extensions: ['gpkg', 'geopackage'],
-    priority: 6,
+    priority: 7,
     color: '#ea79ba',
     mimeTypes: ['application/geopackage+sqlite3'],
   },
   zip: {
     extensions: ['zip', 'tar.gz'],
-    priority: 7,
+    priority: 8,
     color: '#f2bb3a',
     mimeTypes: ['application/zip', 'application/x-zip'],
   },
   pdf: {
     extensions: ['pdf'],
-    priority: 8,
+    priority: 9,
     color: '#db544a',
     mimeTypes: ['application/pdf'],
   },
   jpg: {
     extensions: ['jpg', 'jpeg', 'jfif', 'pjpeg', 'pjp'],
-    priority: 8,
+    priority: 9,
     color: '#673ab7',
     mimeTypes: ['image/jpg'],
   },
   svg: {
     extensions: ['svg'],
-    priority: 9,
+    priority: 10,
     color: '#d98294',
     mimeTypes: ['image/svg+xml'],
   },
+  dxf: {
+    extensions: ['dxf'],
+    priority: 11,
+    color: '#de630b',
+    mimeTypes: ['application/x-dxf', 'image/x-dxf'],
+  },
 } as const
 
 export type FileFormat = keyof typeof FORMATS
@@ -102,13 +114,24 @@ export function getLinkPriority(link: DatasetDistribution): number {
   return getFormatPriority(getFileFormat(link))
 }
 
-export function extensionToFormat(extension: string): FileFormat {
-  for (const format in FORMATS) {
-    for (const alias of FORMATS[format].extensions) {
-      if (alias === extension.toLowerCase()) return format as FileFormat
+export function getFileFormatFromServiceOutput(
+  serviceOutput: string
+): FileFormat | null {
+  function formatMatcher(format: typeof FORMATS[FileFormat]): boolean {
+    const output = serviceOutput.toLowerCase()
+    return (
+      format.extensions.some((extension: string) =>
+        output.includes(extension)
+      ) ||
+      format.mimeTypes.some((mimeType: string) => output.includes(mimeType))
+    )
+  }
+  for (const formatName in FORMATS) {
+    if (formatMatcher(FORMATS[formatName])) {
+      return formatName as FileFormat
     }
   }
-  return undefined
+  return null
 }
 
 export function getFileFormat(link: DatasetDistribution): FileFormat {

package/src/libs/util/shared/src/lib/utils/bytes-convert.ts

@@ -0,0 +1,3 @@
+export function megabytesToBytes(megabytes) {
+  return megabytes * 1048576
+}

package/src/libs/util/shared/src/lib/utils/image-resize.ts

@@ -0,0 +1,72 @@
+export function downsizeImage(
+  blob: Blob,
+  maxWidth: number,
+  maxHeight: number
+): Promise<Blob> {
+  return new Promise((resolve, reject) => {
+    const image = new Image()
+    image.src = URL.createObjectURL(blob)
+    image.onload = () => {
+      let width = image.width
+      let height = image.height
+
+      if (width > maxWidth || height > maxHeight) {
+        if (width > height) {
+          height = height * (maxWidth / width)
+          width = maxWidth
+        } else {
+          width = width * (maxHeight / height)
+          height = maxHeight
+        }
+      }
+
+      const canvas = document.createElement('canvas')
+      canvas.width = width
+      canvas.height = height
+
+      const context = canvas.getContext('2d')
+      context.drawImage(image, 0, 0, width, height)
+
+      canvas.toBlob(resolve, blob.type)
+    }
+    image.onerror = reject
+  })
+}
+
+export function downgradeImage(
+  blob: Blob,
+  maxSizeBytes: number
+): Promise<Blob> {
+  return new Promise((resolve, reject) => {
+    const image = new Image()
+    image.src = URL.createObjectURL(blob)
+    image.onload = () => {
+      const width = image.width
+      const height = image.height
+      let quality = 1.0
+
+      const canvas = document.createElement('canvas')
+      canvas.width = width
+      canvas.height = height
+
+      const context = canvas.getContext('2d')
+      context.drawImage(image, 0, 0, width, height)
+
+      const compressAndResolveBlob = (blobToCompress: Blob) => {
+        if (blobToCompress.size <= maxSizeBytes) {
+          resolve(blobToCompress)
+        } else {
+          quality -= 0.1
+          if (quality >= 0) {
+            canvas.toBlob(compressAndResolveBlob, blob.type, quality)
+          } else {
+            reject('Unable to compress image below max size')
+          }
+        }
+      }
+
+      canvas.toBlob(compressAndResolveBlob, blob.type, quality)
+    }
+    image.onerror = reject
+  })
+}

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

@@ -1,8 +1,11 @@
+export * from './bytes-convert'
+export * from './event'
+export * from './fuzzy-filter'
+export * from './geojson'
+export * from './image-resize'
 export * from './parse'
-export * from './strip-html'
 export * from './remove-whitespace'
-export * from './geojson'
 export * from './sort-by'
+export * from './strip-html'
+export * from './temporal-extent-union'
 export * from './url'
-export * from './event'
-export * from './fuzzy-filter'

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

@@ -0,0 +1,32 @@
+export function getTemporalRangeUnion(ranges) {
+  let earliestStartDate = Infinity
+  let latestEndDate = -Infinity
+  if (ranges.length) {
+    for (let i = 0; i < ranges.length; i++) {
+      const rangeStart = ranges[i].start
+        ? new Date(ranges[i].start).getTime()
+        : -Infinity
+      const rangeEnd = ranges[i].end
+        ? new Date(ranges[i].end).getTime()
+        : Infinity
+      if (rangeStart < earliestStartDate) {
+        earliestStartDate = rangeStart
+      }
+      if (rangeEnd > latestEndDate) {
+        latestEndDate = rangeEnd
+      }
+    }
+    return {
+      start:
+        earliestStartDate !== -Infinity
+          ? new Date(earliestStartDate).toLocaleDateString()
+          : undefined,
+      end:
+        latestEndDate !== Infinity
+          ? new Date(latestEndDate).toLocaleDateString()
+          : undefined,
+    }
+  } else {
+    return undefined
+  }
+}

package/tailwind.base.css

@@ -2,49 +2,78 @@
 @tailwind components;
 @tailwind utilities;
 
+/* PLEASE NOTE: all Tailwind components should be prefixed by `gn-ui` */
 @layer components {
+  /* TODO: add prefix */
   .card-shadow {
     @apply shadow-xl hover:shadow-xl-hover transition-shadow;
   }
 
-  .btn {
-    @apply flex flex-row items-center text-[1em] leading-none p-[1em] rounded-[0.25em] transition-all duration-100 focus:outline-none disabled:opacity-50;
+  /* BUTTON CLASSES */
+  /* these are used behind the scenes by the `gn-ui-button` component */
+
+  /* this is a base class, do not use it directly */
+  .gn-ui-btn {
+    --rounded: var(--gn-ui-button-rounded, 0.25em);
+    --padding: var(--gn-ui-button-padding, 1em);
+    --width: var(--gn-ui-button-width, auto);
+    --height: var(--gn-ui-button-height, auto);
+    --background: var(--gn-ui-button-background, --color-background);
+    --font-size: var(--gn-ui-button-font-size, 1em);
+    @apply flex flex-row items-center justify-center
+      text-[length:--font-size] leading-none
+      p-[--padding] rounded-[--rounded] w-[--width] h-[--height] overflow-hidden
+      bg-[--background] transition-all duration-100
+      focus:outline-none
+      disabled:opacity-50 disabled:pointer-events-none;
+  }
+  /* 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;
+    flex-shrink: 0;
+  }
+  /* makes spinners appear in the right color */
+  .gn-ui-btn mat-spinner circle {
+    stroke: currentColor !important;
   }
 
-  .btn-default {
-    @apply btn text-white
+  .gn-ui-btn-default {
+    @apply gn-ui-btn text-white
       bg-gray-700 hover:bg-gray-800 active:bg-gray-900
       border border-gray-700 focus:ring-4 focus:ring-gray-200;
   }
 
-  .btn-primary {
-    @apply btn text-white
+  .gn-ui-btn-primary {
+    @apply gn-ui-btn text-white
       bg-primary hover:bg-primary-darker focus:bg-primary-darker active:bg-primary-darkest
       border border-primary focus:ring-4 focus:ring-primary-lightest;
   }
 
-  .btn-secondary {
-    @apply btn text-white
+  .gn-ui-btn-secondary {
+    @apply gn-ui-btn text-white
       bg-secondary hover:bg-secondary-darker focus:bg-secondary-darker active:bg-secondary-darkest
       border border-secondary focus:ring-4 focus:ring-secondary-lightest;
   }
 
-  .btn-outline {
-    @apply btn text-main
-      bg-white hover:text-primary-darker focus:text-primary-darker active:text-primary-black
-      border border-gray-300 hover:border-primary-lighter focus:border-primary-lighter focus:ring-4 focus:ring-primary-lightest active:border-primary-darker;
+  .gn-ui-btn-outline {
+    @apply gn-ui-btn text-main
+    hover:text-primary-darker focus:text-primary-darker active:text-primary-black
+    border border-gray-300 hover:border-primary-lighter focus:border-primary-lighter focus:ring-4 focus:ring-primary-lightest active:border-primary-darker;
   }
 
-  .btn-light {
-    @apply btn text-main
-      bg-white hover:bg-gray-50 focus:bg-gray-50 active:bg-gray-100
+  .gn-ui-btn-light {
+    @apply gn-ui-btn text-main
+      hover:bg-gray-50 focus:bg-gray-50 active:bg-gray-100
       border border-white focus:ring-4 focus:ring-gray-300;
   }
 
+  /* TODO: add prefix */
   .badge-btn {
     @apply flex items-center justify-center px-4 py-1 text-white rounded backdrop-blur;
   }
 
+  /* TODO: add prefix */
   .card-icon {
     @apply text-primary opacity-50 group-hover:text-secondary group-hover:opacity-100 transition-colors transition-opacity;
   }