geonetwork-ui 2.6.0-dev.f073bbb4e → 2.6.1-dev.0811518a1

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-online-link-resources/form-field-online-link-resources.component.ts

@@ -26,7 +26,7 @@ import {
   ModalDialogComponent,
   SortableListComponent,
 } from '../../../../../../../../../libs/ui/layout/src'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import { TranslateDirective, TranslateService } from '@ngx-translate/core'
 import { Subscription } from 'rxjs'
 import { MAX_UPLOAD_SIZE_MB } from '../../../../fields.config'
 import { OnlineResourceCardComponent } from '../../../online-resource-card/online-resource-card.component'
@@ -45,7 +45,7 @@ import { OnlineResourceCardComponent } from '../../../online-resource-card/onlin
     TextInputComponent,
     TextAreaComponent,
     UrlInputComponent,
-    TranslateModule,
+    TranslateDirective,
   ],
 })
 export class FormFieldOnlineLinkResourcesComponent {

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-online-resources/form-field-online-resources.component.ts

@@ -31,7 +31,7 @@ import {
   ModalDialogComponent,
   SortableListComponent,
 } from '../../../../../../../../../libs/ui/layout/src'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import { TranslateDirective, TranslateService } from '@ngx-translate/core'
 import { Subscription } from 'rxjs'
 import { MAX_UPLOAD_SIZE_MB } from '../../../../fields.config'
 import { OnlineResourceCardComponent } from '../../../online-resource-card/online-resource-card.component'
@@ -58,7 +58,7 @@ type OnlineNotLinkResource =
     OnlineResourceCardComponent,
     TextInputComponent,
     TextAreaComponent,
-    TranslateModule,
+    TranslateDirective,
   ],
 })
 export class FormFieldOnlineResourcesComponent {

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-open-data/form-field-open-data.component.ts

@@ -8,7 +8,7 @@ import {
 } from '@angular/core'
 import { Constraint } from '../../../../../../../../../libs/common/domain/src/lib/model/record'
 import { CheckToggleComponent } from '../../../../../../../../../libs/ui/inputs/src'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslatePipe } from '@ngx-translate/core'
 import { OPEN_DATA_LICENSE } from './../../../../fields.config'
 
 @Component({
@@ -16,7 +16,7 @@ import { OPEN_DATA_LICENSE } from './../../../../fields.config'
   templateUrl: './form-field-open-data.component.html',
   styleUrls: ['./form-field-open-data.component.css'],
   standalone: true,
-  imports: [CheckToggleComponent, TranslateModule],
+  imports: [CheckToggleComponent, TranslatePipe],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FormFieldOpenDataComponent implements OnChanges {

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-overviews/form-field-overviews.component.ts

@@ -11,7 +11,7 @@ import { GraphicOverview } from '../../../../../../../../../libs/common/domain/s
 import { ImageInputComponent } from '../../../../../../../../../libs/ui/elements/src'
 import { PlatformServiceInterface } from '../../../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { NotificationsService } from '../../../../../../../../../libs/feature/notifications/src'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import { TranslateService } from '@ngx-translate/core'
 import { Subscription } from 'rxjs'
 import { MAX_UPLOAD_SIZE_MB } from '../../../../fields.config'
 
@@ -21,7 +21,7 @@ import { MAX_UPLOAD_SIZE_MB } from '../../../../fields.config'
   styleUrls: ['./form-field-overviews.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, ImageInputComponent, TranslateModule],
+  imports: [CommonModule, ImageInputComponent],
 })
 export class FormFieldOverviewsComponent {
   @Input() metadataUuid: string

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-spatial-extent/form-field-spatial-extent.component.html

@@ -8,8 +8,8 @@
   >
   </gn-ui-generic-keywords>
   <div class="w-full h-96 mt-2">
-    <gn-ui-form-field-map-container
+    <gn-ui-spatial-extent
       [spatialExtents]="spatialExtents$ | async"
-    ></gn-ui-form-field-map-container>
+    ></gn-ui-spatial-extent>
   </div>
 </div>

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-spatial-extent/form-field-spatial-extent.component.ts

@@ -9,9 +9,9 @@ import { PlatformServiceInterface } from '../../../../../../../../../libs/common
 import { firstValueFrom, map, shareReplay } from 'rxjs'
 import { EditorFacade } from '../../../../+state/editor.facade'
 import { switchMap } from 'rxjs/operators'
-import { FormFieldMapContainerComponent } from '../form-field-map-container/form-field-map-container.component'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import { TranslatePipe, TranslateService } from '@ngx-translate/core'
 import { SPATIAL_SCOPES } from '../../../../fields.config'
+import { SpatialExtentComponent } from '../../../../../../../../../libs/ui/map/src'
 
 // This intermediary type will let us keep track of which keyword is bound to
 // which extent; these properties will not be persisted
@@ -35,8 +35,8 @@ type KeywordWithExtent = Keyword & {
   imports: [
     CommonModule,
     GenericKeywordsComponent,
-    FormFieldMapContainerComponent,
-    TranslateModule,
+    TranslatePipe,
+    SpatialExtentComponent,
   ],
 })
 export class FormFieldSpatialExtentComponent {

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-temporal-extents/form-field-temporal-extents.component.ts

@@ -13,7 +13,7 @@ import {
   DatePickerComponent,
   DateRangePickerComponent,
 } from '../../../../../../../../../libs/ui/inputs/src'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import { TranslateDirective, TranslateService } from '@ngx-translate/core'
 import { combineLatest, map } from 'rxjs'
 import {
   NgIconComponent,
@@ -34,7 +34,7 @@ import { iconoirPlus } from '@ng-icons/iconoir'
     SortableListComponent,
     DatePickerComponent,
     DateRangePickerComponent,
-    TranslateModule,
+    TranslateDirective,
     NgIconComponent,
   ],
   providers: [

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-update-frequency/form-field-update-frequency.component.ts

@@ -17,7 +17,7 @@ import {
   DropdownChoice,
   DropdownSelectorComponent,
 } from '../../../../../../../../../libs/ui/inputs/src'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import { TranslatePipe, TranslateService } from '@ngx-translate/core'
 import { firstValueFrom } from 'rxjs'
 
 const initialListValues = updateFrequencyCodeValues.filter(
@@ -30,7 +30,7 @@ const initialListValues = updateFrequencyCodeValues.filter(
   styleUrls: ['./form-field-update-frequency.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CheckToggleComponent, DropdownSelectorComponent, TranslateModule],
+  imports: [CheckToggleComponent, DropdownSelectorComponent, TranslatePipe],
 })
 export class FormFieldUpdateFrequencyComponent implements OnInit {
   @Input() value: UpdateFrequency

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.ts

@@ -4,12 +4,9 @@ import {
   Component,
   ElementRef,
   EventEmitter,
-  Injector,
   Input,
   Output,
   ViewChild,
-  afterNextRender,
-  inject,
 } from '@angular/core'
 import { MatTooltipModule } from '@angular/material/tooltip'
 import {
@@ -22,9 +19,8 @@ import {
   OnlineResource,
   UpdateFrequency,
 } from '../../../../../../../../libs/common/domain/src/lib/model/record'
-import { EditableLabelDirective } from '../../../../../../../../libs/ui/inputs/src'
 import { FormFieldWrapperComponent } from '../../../../../../../../libs/ui/layout/src'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslatePipe } from '@ngx-translate/core'
 import {
   FormFieldDateComponent,
   FormFieldLicenseComponent,
@@ -35,15 +31,11 @@ import {
   FormFieldComponentName,
   FormFieldConfig,
 } from '../../../models'
-import { FormFieldArrayComponent } from './form-field-array/form-field-array.component'
 import { FormFieldContactsForResourceComponent } from './form-field-contacts-for-resource/form-field-contacts-for-resource.component'
 import { FormFieldContactsComponent } from './form-field-contacts/form-field-contacts.component'
-import { FormFieldFileComponent } from './form-field-file/form-field-file.component'
 import { FormFieldKeywordsComponent } from './form-field-keywords/form-field-keywords.component'
-import { FormFieldObjectComponent } from './form-field-object/form-field-object.component'
 import { FormFieldOnlineLinkResourcesComponent } from './form-field-online-link-resources/form-field-online-link-resources.component'
 import { FormFieldOnlineResourcesComponent } from './form-field-online-resources/form-field-online-resources.component'
-import { FormFieldOpenDataComponent } from './form-field-open-data/form-field-open-data.component'
 import { FormFieldOverviewsComponent } from './form-field-overviews/form-field-overviews.component'
 import { FormFieldRichComponent } from './form-field-rich/form-field-rich.component'
 import { FormFieldSimpleComponent } from './form-field-simple/form-field-simple.component'
@@ -62,8 +54,7 @@ import { FormFieldSpatialToggleComponent } from './form-field-spatial-toggle/for
   standalone: true,
   imports: [
     CommonModule,
-    TranslateModule,
-    EditableLabelDirective,
+    TranslatePipe,
     MatTooltipModule,
     FormFieldWrapperComponent,
     FormFieldLicenseComponent,
@@ -72,14 +63,10 @@ import { FormFieldSpatialToggleComponent } from './form-field-spatial-toggle/for
     FormFieldTemporalExtentsComponent,
     FormFieldSimpleComponent,
     FormFieldRichComponent,
-    FormFieldObjectComponent,
     FormFieldSpatialExtentComponent,
-    FormFieldFileComponent,
-    FormFieldArrayComponent,
     FormFieldKeywordsComponent,
     FormFieldOverviewsComponent,
     FormFieldContactsForResourceComponent,
-    FormFieldOpenDataComponent,
     FormFieldOnlineResourcesComponent,
     FormFieldOnlineLinkResourcesComponent,
     FormFieldContactsComponent,

package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.ts

@@ -3,7 +3,7 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'
 import { EditorFacade } from '../../+state/editor.facade'
 import { EditorFieldValue } from '../../models'
 import { FormFieldComponent } from './form-field'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective } from '@ngx-translate/core'
 import {
   EditorFieldWithValue,
   EditorSectionWithValues,
@@ -17,7 +17,7 @@ import { CatalogRecordKeys } from '../../../../../../../libs/common/domain/src/l
   styleUrls: ['./record-form.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, FormFieldComponent, TranslateModule],
+  imports: [CommonModule, FormFieldComponent, TranslateDirective],
 })
 export class RecordFormComponent {
   recordUniqueIdentifier$ = this.facade.record$.pipe(

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

@@ -4,30 +4,20 @@ import { NgModule } from '@angular/core'
 import { MatNativeDateModule } from '@angular/material/core'
 import { MatDatepickerModule } from '@angular/material/datepicker'
 import { MatFormFieldModule } from '@angular/material/form-field'
-import { TextInputComponent, UiInputsModule } from '../../../../../libs/ui/inputs/src'
-import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
+import { TextInputComponent } from '../../../../../libs/ui/inputs/src'
 import { EffectsModule } from '@ngrx/effects'
 import { StoreModule } from '@ngrx/store'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { EditorEffects } from './+state/editor.effects'
 import { EditorFacade } from './+state/editor.facade'
 import * as fromEditor from './+state/editor.reducer'
-import { WizardFieldComponent } from './components/wizard-field/wizard-field.component'
-import { WizardSummarizeComponent } from './components/wizard-summarize/wizard-summarize.component'
-import { WizardComponent } from './components/wizard/wizard.component'
 import { Gn4PlatformService } from '../../../../../libs/api/repository/src'
 
 @NgModule({
-  declarations: [
-    WizardComponent,
-    WizardFieldComponent,
-    WizardSummarizeComponent,
-  ],
   imports: [
     CommonModule,
-    UiInputsModule,
-    UiWidgetsModule,
-    TranslateModule.forChild(),
+    TranslateDirective,
+    TranslatePipe,
     MatDatepickerModule,
     MatNativeDateModule,
     MatFormFieldModule,
@@ -40,9 +30,6 @@ import { Gn4PlatformService } from '../../../../../libs/api/repository/src'
     EffectsModule.forFeature([EditorEffects]),
     TextInputComponent,
   ],
-  exports: [WizardComponent, WizardSummarizeComponent],
   providers: [EditorFacade, Gn4PlatformService],
 })
 export class FeatureEditorModule {}
-export * from './models/index'
-export * from './services/wizard.service'

package/src/libs/feature/editor/src/lib/models/index.ts

@@ -1,3 +1 @@
-export * from './wizard-field.model'
-export * from './wizard-field.type'
 export * from './editor-config.model'

package/src/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-from-catalog.component.ts

@@ -2,6 +2,7 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'
 import {
   FeatureSearchModule,
   FIELDS_BRIEF,
+  FuzzySearchComponent,
   SearchFacade,
   SearchService,
 } from '../../../../../../libs/feature/search/src'
@@ -32,7 +33,7 @@ import { AddLayerRecordPreviewComponent } from './add-layer-record-preview/add-l
       },
     },
   ],
-  imports: [FeatureSearchModule],
+  imports: [FeatureSearchModule, FuzzySearchComponent],
 })
 export class AddLayerFromCatalogComponent implements OnInit {
   constructor(private searchFacade: SearchFacade) {}

package/src/libs/feature/map/src/lib/add-layer-from-file/add-layer-from-file.component.ts

@@ -2,8 +2,8 @@ import { ChangeDetectorRef, Component } from '@angular/core'
 import { MapFacade } from '../+state/map.facade'
 import { MapContextLayerGeojson } from '@geospatial-sdk/core'
 import { firstValueFrom } from 'rxjs'
-import { UiInputsModule } from '../../../../../../libs/ui/inputs/src'
-import { TranslateModule } from '@ngx-translate/core'
+import { DragAndDropFileInputComponent } from '../../../../../../libs/ui/inputs/src'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { CommonModule } from '@angular/common'
 
 const INVALID_FILE_FORMAT_ERROR_MESSAGE = 'Invalid file format'
@@ -13,7 +13,12 @@ const INVALID_FILE_FORMAT_ERROR_MESSAGE = 'Invalid file format'
   templateUrl: './add-layer-from-file.component.html',
   styleUrls: ['./add-layer-from-file.component.css'],
   standalone: true,
-  imports: [UiInputsModule, TranslateModule, CommonModule],
+  imports: [
+    TranslateDirective,
+    TranslatePipe,
+    CommonModule,
+    DragAndDropFileInputComponent,
+  ],
 })
 export class AddLayerFromFileComponent {
   errorMessage: string | null = null

package/src/libs/feature/map/src/lib/add-layer-from-ogc-api/add-layer-from-ogc-api.component.ts

@@ -8,11 +8,12 @@ import {
 } from '@angular/core'
 import { OgcApiEndpoint } from '@camptocamp/ogc-client'
 import { debounceTime, Subject } from 'rxjs'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslatePipe } from '@ngx-translate/core'
 import {
+  ButtonComponent,
   DropdownChoice,
+  DropdownSelectorComponent,
   TextInputComponent,
-  UiInputsModule,
 } from '../../../../../../libs/ui/inputs/src'
 import { CommonModule } from '@angular/common'
 import { MapContextLayer, MapContextLayerOgcApi } from '@geospatial-sdk/core'
@@ -22,7 +23,13 @@ import { MapContextLayer, MapContextLayerOgcApi } from '@geospatial-sdk/core'
   templateUrl: './add-layer-from-ogc-api.component.html',
   styleUrls: ['./add-layer-from-ogc-api.component.css'],
   standalone: true,
-  imports: [CommonModule, TranslateModule, UiInputsModule, TextInputComponent],
+  imports: [
+    CommonModule,
+    TextInputComponent,
+    DropdownSelectorComponent,
+    TranslatePipe,
+    ButtonComponent,
+  ],
 })
 export class AddLayerFromOgcApiComponent implements OnInit {
   @Input() ogcUrl: string

package/src/libs/feature/map/src/lib/add-layer-from-wfs/add-layer-from-wfs.component.ts

@@ -5,7 +5,7 @@ import { MapFacade } from '../+state/map.facade'
 import { debounceTime } from 'rxjs/operators'
 import { MapContextLayer } from '@geospatial-sdk/core'
 import { ButtonComponent, TextInputComponent } from '../../../../../../libs/ui/inputs/src'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { CommonModule } from '@angular/common'
 
 @Component({
@@ -13,7 +13,13 @@ import { CommonModule } from '@angular/common'
   templateUrl: './add-layer-from-wfs.component.html',
   styleUrls: ['./add-layer-from-wfs.component.css'],
   standalone: true,
-  imports: [TextInputComponent, ButtonComponent, TranslateModule, CommonModule],
+  imports: [
+    TextInputComponent,
+    ButtonComponent,
+    TranslateDirective,
+    TranslatePipe,
+    CommonModule,
+  ],
 })
 export class AddLayerFromWfsComponent implements OnInit {
   wfsUrl = ''

package/src/libs/feature/map/src/lib/add-layer-from-wms/add-layer-from-wms.component.ts

@@ -6,14 +6,20 @@ import { debounceTime } from 'rxjs/operators'
 import { MapContextLayer } from '@geospatial-sdk/core'
 import { ButtonComponent, TextInputComponent } from '../../../../../../libs/ui/inputs/src'
 import { CommonModule } from '@angular/common'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-add-layer-from-wms',
   templateUrl: './add-layer-from-wms.component.html',
   styleUrls: ['./add-layer-from-wms.component.css'],
   standalone: true,
-  imports: [TextInputComponent, CommonModule, TranslateModule, ButtonComponent],
+  imports: [
+    TextInputComponent,
+    CommonModule,
+    TranslateDirective,
+    TranslatePipe,
+    ButtonComponent,
+  ],
 })
 export class AddLayerFromWmsComponent implements OnInit {
   wmsUrl = ''

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

@@ -1,29 +1,12 @@
 import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { UiLayoutModule } from '../../../../../libs/ui/layout/src'
-import { MatTabsModule } from '@angular/material/tabs'
-import { TranslateModule } from '@ngx-translate/core'
-import { FeatureSearchModule } from '../../../../../libs/feature/search/src'
 import { StoreModule } from '@ngrx/store'
 import * as fromMap from './+state/map.reducer'
 import { MapFacade } from './+state/map.facade'
-import { UiElementsModule } from '../../../../../libs/ui/elements/src'
-import { TextInputComponent, UiInputsModule } from '../../../../../libs/ui/inputs/src'
 import { GEOCODING_PROVIDER, GeocodingProvider } from './geocoding.service'
-import { AddLayerFromOgcApiComponent } from './add-layer-from-ogc-api/add-layer-from-ogc-api.component'
 
 @NgModule({
   imports: [
-    CommonModule,
-    UiLayoutModule,
-    MatTabsModule,
-    TranslateModule,
-    FeatureSearchModule,
     StoreModule.forFeature(fromMap.MAP_FEATURE_KEY, fromMap.mapReducer),
-    UiElementsModule,
-    UiInputsModule,
-    AddLayerFromOgcApiComponent,
-    TextInputComponent,
   ],
   providers: [
     MapFacade,

package/src/libs/feature/map/src/lib/geocoding/geocoding.component.ts

@@ -4,8 +4,8 @@ import { debounceTime, switchMap } from 'rxjs/operators'
 import { GeocodingService } from '../geocoding.service'
 import { MapFacade } from '../+state/map.facade'
 import { CommonModule } from '@angular/common'
-import { SearchInputComponent, UiInputsModule } from '../../../../../../libs/ui/inputs/src'
-import { TranslateModule } from '@ngx-translate/core'
+import { SearchInputComponent } from '../../../../../../libs/ui/inputs/src'
+import { TranslatePipe } from '@ngx-translate/core'
 import { MapContextView } from '@geospatial-sdk/core'
 
 @Component({
@@ -13,12 +13,7 @@ import { MapContextView } from '@geospatial-sdk/core'
   templateUrl: './geocoding.component.html',
   styleUrls: ['./geocoding.component.css'],
   standalone: true,
-  imports: [
-    CommonModule,
-    UiInputsModule,
-    TranslateModule,
-    SearchInputComponent,
-  ],
+  imports: [CommonModule, SearchInputComponent, TranslatePipe],
 })
 export class GeocodingComponent implements OnDestroy {
   searchText = ''

package/src/libs/feature/map/src/lib/layers-panel/layers-panel.component.ts

@@ -9,7 +9,7 @@ import { AddLayerFromWfsComponent } from '../add-layer-from-wfs/add-layer-from-w
 import { AddLayerFromWmsComponent } from '../add-layer-from-wms/add-layer-from-wms.component'
 import { AddLayerFromCatalogComponent } from '../add-layer-from-catalog/add-layer-from-catalog.component'
 import { AddLayerFromFileComponent } from '../add-layer-from-file/add-layer-from-file.component'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { CommonModule } from '@angular/common'
 import {
   NgIconComponent,
@@ -35,7 +35,8 @@ import { matChevronRight } from '@ng-icons/material-icons/baseline'
     AddLayerFromWmsComponent,
     AddLayerFromCatalogComponent,
     AddLayerFromFileComponent,
-    TranslateModule,
+    TranslateDirective,
+    TranslatePipe,
     CommonModule,
     NgIconComponent,
     ExpandablePanelButtonComponent,

package/src/libs/feature/record/src/index.ts

@@ -1,12 +1,10 @@
 export * from './lib/feature-record.module'
-export * from './lib/gn-ui-version.token'
 export * from './lib/state'
 export * from './lib/data-view-permalink/data-view-permalink.component'
 export * from './lib/data-view/data-view.component'
 export * from './lib/data-view-share/data-view-share.component'
 export * from './lib/data-view-web-component/data-view-web-component.component'
 export * from './lib/external-viewer-button/external-viewer-button.component'
-export * from './lib/map-view/map-view.component'
 export * from './lib/gpf-api-dl/gpf-api-dl.component'
+export * from './lib/map-view/map-view.component'
 export * from './lib/record-meta/record-meta.component'
-export * from './lib/external-viewer-button/external-viewer-button.component'

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 { DatavizChartConfigModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
+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,18 @@ export class DataViewComponent {
   @Input() set exceedsLimit(value: boolean) {
     this.excludeWfs$.next(value)
   }
-  @Output() chartConfig$ = new BehaviorSubject<DatavizConfigurationModel>(null)
+  _selectedView = ''
+  @Input() set selectedView(value: string) {
+    this._selectedView = value
+    if (value !== 'map') {
+      this.linkSelected.emit(this.selectedLink$.value)
+    }
+  }
+  @Output() chartConfig$ = new BehaviorSubject<DatavizChartConfigModel>(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,27 +83,22 @@ 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) {
+  setChartConfig(event: DatavizChartConfigModel) {
     this.mdViewFacade.setChartConfig(event)
   }
 
   selectLink(linkAsString: string) {
     const link: DatasetOnlineResource = JSON.parse(linkAsString)
+    if (this._selectedView && this._selectedView !== 'map') {
+      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)
   }
 }