geonetwork-ui 2.6.0-dev.128618187 → 2.6.0-dev.14c46265d

package/src/libs/feature/record/src/lib/data-view/data-view.component.html

@@ -1,14 +1,18 @@
-<div class="w-full h-full flex flex-col p-1">
-  <gn-ui-dropdown-selector
-    *ngIf="dropdownChoices$ | async as choices"
-    [ngClass]="{ hidden: !displaySource }"
-    [title]="'table.select.data' | translate"
-    class="truncate p-1 -mx-1 self-end mb-1"
-    extraBtnClass="!text-primary font-sans font-medium"
-    [choices]="choices"
-    (selectValue)="selectLink($event)"
-  ></gn-ui-dropdown-selector>
-  <ng-container *ngIf="hidePreview; else dataView">
+<div class="w-full h-full flex flex-col gap-[13px]">
+  <div
+    class="w-full py-4 px-5 bg-white border border-color-border rounded-lg mt-6"
+  >
+    <gn-ui-dropdown-selector
+      *ngIf="dropdownChoices$ | async as choices"
+      [ngClass]="{ hidden: !displaySource }"
+      [title]="'table.select.data' | translate"
+      class="h-[44px] w-full"
+      extraBtnClass="font-sans font-bold"
+      [choices]="choices"
+      (selectValue)="selectLink($event)"
+    ></gn-ui-dropdown-selector>
+  </div>
+  <ng-container *ngIf="hidePreview$ | async; else dataView">
     <gn-ui-popup-alert
       type="warning"
       icon="matErrorOutlineOutline"
@@ -23,12 +27,14 @@
         *ngIf="mode === 'table'"
         [cacheActive]="cacheActive$ | async"
         [link]="selectedLink$ | async"
+        [featureCatalog]="mdViewFacade.featureCatalog$ | async"
       ></gn-ui-table-view>
       <gn-ui-chart-view
         *ngIf="mode === 'chart'"
         (chartConfig$)="setChartConfig($event)"
         [cacheActive]="cacheActive$ | async"
         [link]="selectedLink$ | async"
+        [featureCatalog]="mdViewFacade.featureCatalog$ | async"
       ></gn-ui-chart-view>
     </div>
   </ng-template>

package/src/libs/feature/record/src/lib/data-view/data-view.component.ts

@@ -1,22 +1,26 @@
 import {
   ChangeDetectionStrategy,
   Component,
+  EventEmitter,
   Input,
   Output,
 } from '@angular/core'
 import { getLinkLabel, getLinkPriority } from '../../../../../../libs/util/shared/src'
-import { BehaviorSubject, combineLatest, of } from 'rxjs'
-import { catchError, finalize, map, switchMap, tap } from 'rxjs/operators'
+import { BehaviorSubject, combineLatest } from 'rxjs'
+import { map, tap } from 'rxjs/operators'
 import { MdViewFacade } from '../state'
 import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
-import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  DatasetOnlineResource,
+  DatasetServiceDistribution,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 import { DropdownSelectorComponent } from '../../../../../../libs/ui/inputs/src'
 import {
   ChartViewComponent,
   TableViewComponent,
 } from '../../../../../../libs/feature/dataviz/src'
 import { CommonModule } from '@angular/common'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { PopupAlertComponent } from '../../../../../../libs/ui/widgets/src'
 
 @Component({
@@ -29,7 +33,8 @@ import { PopupAlertComponent } from '../../../../../../libs/ui/widgets/src'
     CommonModule,
     DropdownSelectorComponent,
     TableViewComponent,
-    TranslateModule,
+    TranslateDirective,
+    TranslatePipe,
     ChartViewComponent,
     PopupAlertComponent,
   ],
@@ -40,11 +45,16 @@ export class DataViewComponent {
   @Input() set exceedsLimit(value: boolean) {
     this.excludeWfs$.next(value)
   }
+  @Input() set selectedView(value: string) {
+    if (value !== 'map') {
+      this.linkSelected.emit(this.selectedLink$.value)
+    }
+  }
   @Output() chartConfig$ = new BehaviorSubject<DatavizConfigurationModel>(null)
+  @Output() linkSelected = new EventEmitter<DatasetOnlineResource>()
   cacheActive$ = this.mdViewFacade.isHighUpdateFrequency$.pipe(
     map((highF) => !highF)
   )
-  hidePreview = false
   excludeWfs$ = new BehaviorSubject(false)
   compatibleDataLinks$ = combineLatest([
     this.mdViewFacade.dataLinks$,
@@ -71,6 +81,10 @@ export class DataViewComponent {
   )
   selectedLink$ = new BehaviorSubject<DatasetOnlineResource>(null)
 
+  hidePreview$ = this.excludeWfs$.pipe(
+    map((excludeWfs) => this.mode === 'chart' && excludeWfs)
+  )
+
   constructor(private mdViewFacade: MdViewFacade) {}
 
   setChartConfig(event: DatavizConfigurationModel) {
@@ -79,19 +93,8 @@ export class DataViewComponent {
 
   selectLink(linkAsString: string) {
     const link: DatasetOnlineResource = JSON.parse(linkAsString)
+    this.linkSelected.emit(link)
     link.url = new URL(link.url)
-    this.excludeWfs$
-      .pipe(
-        tap((excludeWfs) => {
-          this.hidePreview =
-            link['accessServiceProtocol'] === 'wfs' &&
-            excludeWfs &&
-            this.mode === 'chart'
-              ? true
-              : false
-          this.selectedLink$.next(link)
-        })
-      )
-      .subscribe()
+    this.selectedLink$.next(link)
   }
 }

package/src/libs/feature/record/src/lib/data-view-permalink/data-view-permalink.component.ts

@@ -9,10 +9,10 @@ import {
 import { Configuration } from '../../../../../../libs/data-access/gn4/src'
 import { BehaviorSubject, combineLatest, map } from 'rxjs'
 import { MdViewFacade } from '../state'
-import { GN_UI_VERSION } from '../gn-ui-version.token'
 import { CopyTextButtonComponent } from '../../../../../../libs/ui/inputs/src'
 import { CommonModule } from '@angular/common'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslatePipe } from '@ngx-translate/core'
+import { GEONETWORK_UI_TAG_NAME } from '../../../../../../libs/util/shared/src'
 
 export const WEB_COMPONENT_EMBEDDER_URL = new InjectionToken<string>(
   'webComponentEmbedderUrl'
@@ -24,7 +24,7 @@ export const WEB_COMPONENT_EMBEDDER_URL = new InjectionToken<string>(
   styleUrls: ['./data-view-permalink.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, CopyTextButtonComponent, TranslateModule],
+  imports: [CommonModule, CopyTextButtonComponent, TranslatePipe],
 })
 export class DataViewPermalinkComponent {
   viewType$ = new BehaviorSubject<string>('map')
@@ -40,7 +40,7 @@ export class DataViewPermalinkComponent {
   ]).pipe(
     map(([viewType, config, metadata]) => {
       const url = new URL(`${this.wcEmbedderBaseUrl}`, window.location.origin)
-      url.searchParams.set('v', `${this.version}`)
+      url.searchParams.set('v', `${GEONETWORK_UI_TAG_NAME}`)
       if (viewType === 'chart') {
         if (config) {
           const { aggregation, xProperty, yProperty, chartType } = config
@@ -74,7 +74,6 @@ export class DataViewPermalinkComponent {
     @Optional()
     @Inject(WEB_COMPONENT_EMBEDDER_URL)
     protected wcEmbedderBaseUrl: string,
-    @Inject(GN_UI_VERSION) private version: string,
     private facade: MdViewFacade
   ) {}
 }

package/src/libs/feature/record/src/lib/data-view-share/data-view-share.component.html

@@ -1,4 +1,4 @@
-<div class="px-5 my-1">
+<div>
   <mat-tab-group
     [selectedIndex]="0"
     animationDuration="0ms"

package/src/libs/feature/record/src/lib/data-view-share/data-view-share.component.ts

@@ -12,7 +12,7 @@ import {
 import { MatTabsModule } from '@angular/material/tabs'
 import { CommonModule } from '@angular/common'
 import { DataViewWebComponentComponent } from '../data-view-web-component/data-view-web-component.component'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-data-view-share',
@@ -24,7 +24,7 @@ import { TranslateModule } from '@ngx-translate/core'
     MatTabsModule,
     DataViewPermalinkComponent,
     DataViewWebComponentComponent,
-    TranslateModule,
+    TranslateDirective,
   ],
   standalone: true,
 })

package/src/libs/feature/record/src/lib/data-view-web-component/data-view-web-component.component.ts

@@ -7,10 +7,10 @@ import {
 import { Configuration } from '../../../../../../libs/data-access/gn4/src'
 import { MdViewFacade } from '../state'
 import { BehaviorSubject, combineLatest, map } from 'rxjs'
-import { GN_UI_VERSION } from '../gn-ui-version.token'
 import { CopyTextButtonComponent } from '../../../../../../libs/ui/inputs/src'
 import { CommonModule } from '@angular/common'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslatePipe } from '@ngx-translate/core'
+import { GEONETWORK_UI_TAG_NAME } from '../../../../../../libs/util/shared/src'
 
 @Component({
   selector: 'gn-ui-data-view-web-component',
@@ -18,7 +18,7 @@ import { TranslateModule } from '@ngx-translate/core'
   styleUrls: ['./data-view-web-component.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, CopyTextButtonComponent, TranslateModule],
+  imports: [CommonModule, CopyTextButtonComponent, TranslatePipe],
 })
 export class DataViewWebComponentComponent {
   viewType$ = new BehaviorSubject<string>('map')
@@ -36,7 +36,7 @@ export class DataViewWebComponentComponent {
         if (config) {
           const { aggregation, xProperty, yProperty, chartType } = config
           return `<script src="https://cdn.jsdelivr.net/gh/geonetwork/geonetwork-ui@wc-dist-${
-            this.version
+            GEONETWORK_UI_TAG_NAME
           }/gn-wc.js"></script>
   <gn-dataset-view-chart
           api-url="${new URL(
@@ -59,7 +59,7 @@ export class DataViewWebComponentComponent {
         return ''
       } else if (viewType === 'table') {
         return `<script src="https://cdn.jsdelivr.net/gh/geonetwork/geonetwork-ui@wc-dist-${
-          this.version
+          GEONETWORK_UI_TAG_NAME
         }/gn-wc.js"></script>
   <gn-dataset-view-table
           api-url="${new URL(
@@ -76,7 +76,7 @@ export class DataViewWebComponentComponent {
   ></gn-dataset-view-table>`
       } else {
         return `<script src="https://cdn.jsdelivr.net/gh/geonetwork/geonetwork-ui@wc-dist-${
-          this.version
+          GEONETWORK_UI_TAG_NAME
         }/gn-wc.js"></script>
 <gn-dataset-view-map
         api-url="${new URL(
@@ -97,7 +97,6 @@ export class DataViewWebComponentComponent {
 
   constructor(
     @Inject(Configuration) private config: Configuration,
-    @Inject(GN_UI_VERSION) private version: string,
     private facade: MdViewFacade
   ) {}
 }

package/src/libs/feature/record/src/lib/external-viewer-button/external-viewer-button.component.html

@@ -1,9 +1,9 @@
 <gn-ui-button
   *ngIf="externalViewer"
   (buttonClick)="openInExternalViewer()"
-  type="secondary"
+  type="primary"
   [title]="'record.externalViewer.open' | translate"
-  extraClass="ms-2 !rounded-lg"
+  [extraClass]="extraClass + 'bg-primary ms-2 !rounded-lg'"
 >
   <ng-icon name="matOpenInNew"></ng-icon>
 </gn-ui-button>

package/src/libs/feature/record/src/lib/external-viewer-button/external-viewer-button.component.ts

@@ -8,7 +8,7 @@ import {
 } from '@angular/core'
 import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import { TranslatePipe, TranslateService } from '@ngx-translate/core'
 import { getFileFormat } from '../../../../../../libs/util/shared/src'
 import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
 import { NgIcon, provideIcons } from '@ng-icons/core'
@@ -31,11 +31,12 @@ export const EXTERNAL_VIEWER_OPEN_NEW_TAB = new InjectionToken<boolean>(
   styleUrls: ['./external-viewer-button.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, ButtonComponent, NgIcon, TranslateModule],
+  imports: [CommonModule, ButtonComponent, NgIcon, TranslatePipe],
   viewProviders: [provideIcons({ matOpenInNew })],
 })
 export class ExternalViewerButtonComponent {
   @Input() link: DatasetOnlineResource
+  @Input() extraClass = ''
 
   get externalViewer() {
     return !!this.urlTemplate && !!this.supportedLinkLayerType

package/src/libs/feature/record/src/lib/feature-record.module.ts

@@ -2,13 +2,8 @@ import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { StoreModule } from '@ngrx/store'
 import { EffectsModule } from '@ngrx/effects'
-import { UiLayoutModule } from '../../../../../libs/ui/layout/src'
 import { FeatureMapModule } from '../../../../../libs/feature/map/src'
-import {
-  DropdownSelectorComponent,
-  UiInputsModule,
-} from '../../../../../libs/ui/inputs/src'
-import { UiElementsModule } from '../../../../../libs/ui/elements/src'
+import { DropdownSelectorComponent } from '../../../../../libs/ui/inputs/src'
 import { MdViewFacade } from './state'
 import { MdViewEffects } from './state/mdview.effects'
 import {
@@ -16,8 +11,7 @@ import {
   reducer,
 } from './state/mdview.reducer'
 import { MatTabsModule } from '@angular/material/tabs'
-import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { FeatureCatalogModule } from '../../../../../libs/feature/catalog/src'
 import { DataTableComponent } from '../../../../../libs/ui/dataviz/src'
 import { NgIconsModule, provideNgIconsConfig } from '@ng-icons/core'
@@ -27,14 +21,11 @@ import { NgIconsModule, provideNgIconsConfig } from '@ng-icons/core'
     CommonModule,
     StoreModule.forFeature(METADATA_VIEW_FEATURE_STATE_KEY, reducer),
     EffectsModule.forFeature([MdViewEffects]),
-    UiLayoutModule,
     FeatureMapModule,
     FeatureCatalogModule,
-    UiInputsModule,
-    UiElementsModule,
     MatTabsModule,
-    UiWidgetsModule,
-    TranslateModule,
+    TranslateDirective,
+    TranslatePipe,
     DataTableComponent,
     NgIconsModule,
     DropdownSelectorComponent,

package/src/libs/feature/record/src/lib/gpf-api-dl/gpf-api-dl.component.ts

@@ -5,12 +5,12 @@ import {
   OnInit,
 } from '@angular/core'
 import { DatasetServiceDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { BehaviorSubject, Observable, combineLatest, map, mergeMap } from 'rxjs'
+import { BehaviorSubject, combineLatest, map, mergeMap, Observable } from 'rxjs'
 import { HttpClient } from '@angular/common/http'
 import { Choice, DropdownSelectorComponent } from '../../../../../../libs/ui/inputs/src'
 import axios from 'axios'
 import { CommonModule } from '@angular/common'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { GpfApiDlListItemComponent } from '../gpf-api-dl-list-item/gpf-api-dl-list-item.component'
 
 export interface Label {
@@ -57,7 +57,8 @@ export interface Field {
   standalone: true,
   imports: [
     CommonModule,
-    TranslateModule,
+    TranslateDirective,
+    TranslatePipe,
     DropdownSelectorComponent,
     GpfApiDlListItemComponent,
   ],

package/src/libs/feature/record/src/lib/gpf-api-dl-list-item/gpf-api-dl-list-item.component.ts

@@ -1,16 +1,22 @@
 import { CommonModule } from '@angular/common'
 import { HttpClient } from '@angular/common/http'
 import { Component, Input, OnInit } from '@angular/core'
-import { NgIconsModule } from '@ng-icons/core'
-import { TranslateModule } from '@ngx-translate/core'
-import { Observable, map, mergeMap } from 'rxjs'
+import { NgIconsModule, provideIcons } from '@ng-icons/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
+import { map, mergeMap, Observable } from 'rxjs'
+import { matCloudDownloadOutline } from '@ng-icons/material-icons/outline'
 
 @Component({
   selector: 'gn-ui-gpf-api-dl-list-item',
   templateUrl: './gpf-api-dl-list-item.component.html',
   styleUrls: ['./gpf-api-dl-list-item.component.css'],
   standalone: true,
-  imports: [CommonModule, TranslateModule, NgIconsModule],
+  imports: [CommonModule, TranslateDirective, TranslatePipe, NgIconsModule],
+  providers: [
+    provideIcons({
+      matCloudDownloadOutline,
+    }),
+  ],
 })
 export class GpfApiDlListItemComponent implements OnInit {
   @Input() link

package/src/libs/feature/record/src/lib/map-view/map-view.component.html

@@ -1,18 +1,42 @@
-<div class="w-full h-full flex flex-col p-1">
-  <div class="w-full flex justify-end">
+<div class="w-full h-full flex flex-col gap-[13px]">
+  <div
+    class="flex flex-col md:flex-row gap-4 py-4 px-5 bg-white border border-color-border rounded-lg mt-6"
+  >
     <gn-ui-dropdown-selector
-      [ngClass]="{ hidden: !displaySource }"
-      class="truncate p-1 -mx-1 mb-1"
-      extraBtnClass="!text-primary font-sans font-medium"
+      *ngIf="displaySource"
+      class="w-full md:flex-1 md:min-w-0"
+      extraBtnClass="font-sans font-bold"
       [title]="'map.select.layer' | translate"
       [choices]="dropdownChoices$ | async"
       (selectValue)="selectLinkToDisplay($event)"
     ></gn-ui-dropdown-selector>
-    <gn-ui-external-viewer-button
-      class="shrink-0 py-1 place-self-end"
-      [link]="selectedLink$ | async"
-    >
-    </gn-ui-external-viewer-button>
+
+    <ng-container *ngIf="(styleLinks$ | async)?.length > 0; else styleDisabled">
+      <gn-ui-dropdown-selector
+        class="w-full md:flex-1 md:min-w-0"
+        extraBtnClass="font-sans font-bold"
+        [title]="'map.select.style' | translate"
+        [choices]="styleDropdownChoices$ | async"
+        (selectValue)="selectStyleToDisplay($event)"
+      ></gn-ui-dropdown-selector>
+    </ng-container>
+    <ng-template #styleDisabled>
+      <gn-ui-dropdown-selector
+        class="w-full md:flex-1 md:min-w-0 text-gray-400"
+        extraBtnClass="font-sans font-bold text-gray-400"
+        [title]="'map.select.style' | translate"
+        [choices]="styleDropdownChoices$ | async"
+        [disabled]="true"
+      ></gn-ui-dropdown-selector>
+    </ng-template>
+
+    <div class="self-end md:ml-2">
+      <gn-ui-external-viewer-button
+        extraClass="w-[44px] h-[44px]"
+        [link]="selectedLink$ | async"
+      >
+      </gn-ui-external-viewer-button>
+    </div>
   </div>
   <ng-container *ngIf="hidePreview; else mapView">
     <gn-ui-popup-alert
@@ -49,7 +73,10 @@
         >
           <ng-icon name="matClose" class="align-middle text-sm"></ng-icon>
         </gn-ui-button>
-        <gn-ui-feature-detail [feature]="selection"></gn-ui-feature-detail>
+        <gn-ui-feature-detail
+          [featureCatalog]="mdViewFacade.featureCatalog$ | async"
+          [feature]="selection"
+        ></gn-ui-feature-detail>
       </div>
 
       <div