Merge pull request #2 from camptocamp/update-gnui

chore: update gnui to last version
camptocamp · Jan 17, 2024 · 1d86867 · 1d86867
2 parents 82598bc + 1bfb043
commit 1d86867
Show file tree

Hide file tree

Showing 10 changed files with 15,133 additions and 10,926 deletions.
diff --git a/apps/datahub/project.json b/apps/datahub/project.json
@@ -16,10 +16,7 @@
         "polyfills": ["zone.js"],
         "tsConfig": "apps/datahub/tsconfig.app.json",
         "assets": ["apps/datahub/src/favicon.ico", "apps/datahub/src/assets"],
-        "styles": [
-          "apps/datahub/src/styles.css",
-          "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
-        ],
+        "styles": ["apps/datahub/src/styles.css"],
         "scripts": [],
         "preserveSymlinks": true,
         "allowedCommonJsDependencies": [

diff --git a/apps/datahub/src/app/app.module.ts b/apps/datahub/src/app/app.module.ts
@@ -1,38 +1,39 @@
-import { importProvidersFrom, isDevMode, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { RouterModule } from '@angular/router';
-import { AppComponent } from './app.component';
+import { importProvidersFrom, isDevMode, NgModule } from '@angular/core'
+import { BrowserModule } from '@angular/platform-browser'
+import { RouterModule } from '@angular/router'
+import { AppComponent } from './app.component'
 import {
   DefaultRouterModule,
   EmbeddedTranslateLoader,
   FeatureAuthModule,
   FeatureCatalogModule,
   FeatureSearchModule,
+  provideGn4,
   provideRepositoryUrl,
   RouterService,
   ThemeService,
   TRANSLATE_DEFAULT_CONFIG,
   UiWidgetsModule,
-} from 'geonetwork-ui';
+} from 'geonetwork-ui'
 import {
   TranslateLoader,
   TranslateModule,
   TranslateService,
-} from '@ngx-translate/core';
-import { StoreModule } from '@ngrx/store';
-import { EffectsModule } from '@ngrx/effects';
-import { StoreRouterConnectingModule } from '@ngrx/router-store';
-import { StoreDevtoolsModule } from '@ngrx/store-devtools';
-import { SearchPageComponent } from './search/search-page/search-page.component';
-import { DatasetPageComponent } from './dataset/dataset-page/dataset-page.component';
-import { SearchHeaderComponent } from './search/search-header/search-header.component';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchResultsComponent } from './search/search-results/search-results.component';
-import { HeaderComponent } from './common/header/header.component';
-import { HomePageComponent } from './home/home-page/home-page.component';
-import { AppRouterService } from './app.router.service';
-import { HomeHeaderComponent } from './home/home-header/home-header.component';
-import { MatIconModule } from '@angular/material/icon';
+} from '@ngx-translate/core'
+import { StoreModule } from '@ngrx/store'
+import { EffectsModule } from '@ngrx/effects'
+import { StoreRouterConnectingModule } from '@ngrx/router-store'
+import { StoreDevtoolsModule } from '@ngrx/store-devtools'
+import { SearchPageComponent } from './search/search-page/search-page.component'
+import { DatasetPageComponent } from './dataset/dataset-page/dataset-page.component'
+import { SearchHeaderComponent } from './search/search-header/search-header.component'
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
+import { SearchResultsComponent } from './search/search-results/search-results.component'
+import { HeaderComponent } from './common/header/header.component'
+import { HomePageComponent } from './home/home-page/home-page.component'
+import { AppRouterService } from './app.router.service'
+import { HomeHeaderComponent } from './home/home-header/home-header.component'
+import { MatIconModule } from '@angular/material/icon'
 
 @NgModule({
   declarations: [
@@ -83,15 +84,16 @@ import { MatIconModule } from '@angular/material/icon';
   ],
   providers: [
     importProvidersFrom(FeatureAuthModule),
+    provideGn4(),
     provideRepositoryUrl(() => '/geonetwork/srv/api'),
     { provide: RouterService, useClass: AppRouterService },
   ],
   bootstrap: [AppComponent],
 })
 export class AppModule {
   constructor(translate: TranslateService) {
-    translate.setDefaultLang('fr');
-    translate.use('fr');
+    translate.setDefaultLang('fr')
+    translate.use('fr')
 
     ThemeService.applyCssVariables(
       '#E30513',
@@ -100,6 +102,6 @@ export class AppModule {
       'white',
       'Lato',
       'Montserrat'
-    );
+    )
   }
 }
diff --git a/apps/datahub/src/app/home/home-header/home-header.component.html b/apps/datahub/src/app/home/home-header/home-header.component.html
@@ -7,6 +7,7 @@ <h1 class="flex justify-center mel-page-title" translate="">
       <gn-ui-fuzzy-search
         class="w-[645px] text-[17px] pointer-events-auto"
         (itemSelected)="onFuzzySearchSelection($event)"
+        [autoFocus]="true"
       ></gn-ui-fuzzy-search>
     </div>
     <div class="h-32"></div>

diff --git a/apps/datahub/src/app/home/home-header/home-header.component.ts b/apps/datahub/src/app/home/home-header/home-header.component.ts
@@ -1,7 +1,7 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { RouterFacade, SearchService } from 'geonetwork-ui';
-import { CatalogRecord } from 'geonetwork-ui/src/libs/common/domain/src/lib/record';
-import { SortByField } from 'geonetwork-ui/libs/common/domain/src/lib/search';
+import { ChangeDetectionStrategy, Component } from '@angular/core'
+import { RouterFacade, SearchService } from 'geonetwork-ui'
+import { CatalogRecord } from 'geonetwork-ui/libs/common/domain/src/lib/model/record'
+import { SortByField } from 'geonetwork-ui/libs/common/domain/src/lib/model/search'
 
 @Component({
   selector: 'mel-datahub-home-header',
@@ -23,9 +23,9 @@ export class HomeHeaderComponent {
   ) {}
 
   onFuzzySearchSelection(record: CatalogRecord) {
-    this.routerFacade.goToMetadata(record);
+    this.routerFacade.goToMetadata(record)
   }
   clearSearchAndSort(sort: SortByField | string): void {
-    this.searchService.setSortAndFilters({}, sort as SortByField);
+    this.searchService.setSortAndFilters({}, sort as SortByField)
   }
 }
diff --git a/apps/datahub/src/app/search/search-header/search-header.component.ts b/apps/datahub/src/app/search/search-header/search-header.component.ts
@@ -1,7 +1,7 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { RouterFacade, SearchService } from 'geonetwork-ui';
-import { CatalogRecord } from 'geonetwork-ui/src/libs/common/domain/src/lib/record';
-import { SortByField } from 'geonetwork-ui/libs/common/domain/src/lib/search';
+import { ChangeDetectionStrategy, Component } from '@angular/core'
+import { RouterFacade, SearchService } from 'geonetwork-ui'
+import { CatalogRecord } from 'geonetwork-ui/libs/common/domain/src/lib/model/record'
+import { SortByField } from 'geonetwork-ui/libs/common/domain/src/lib/model/search'
 
 @Component({
   selector: 'mel-datahub-search-header',
@@ -16,9 +16,9 @@ export class SearchHeaderComponent {
   ) {}
 
   onFuzzySearchSelection(record: CatalogRecord) {
-    this.routerFacade.goToMetadata(record);
+    this.routerFacade.goToMetadata(record)
   }
   clearSearchAndSort(sort: SortByField | string): void {
-    this.searchService.setSortAndFilters({}, sort as SortByField);
+    this.searchService.setSortAndFilters({}, sort as SortByField)
   }
 }
diff --git a/apps/datahub/src/app/search/search-results/search-results.component.html b/apps/datahub/src/app/search/search-results/search-results.component.html
@@ -5,7 +5,7 @@
   <div class="mt-8">
     <gn-ui-results-list-container
       showMore="button"
-      [metadataQualityDisplay]="metadataQualityDisplay"
+      [metadataQualityDisplay]="true"
       (mdSelect)="onMetadataSelection($event)"
     ></gn-ui-results-list-container>
   </div>

diff --git a/apps/datahub/src/app/search/search-results/search-results.component.ts b/apps/datahub/src/app/search/search-results/search-results.component.ts
@@ -1,10 +1,6 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'
-import {
-  MetadataQualityDisplay,
-  RouterFacade,
-  SearchFacade,
-} from 'geonetwork-ui'
-import { CatalogRecord } from 'geonetwork-ui/src/libs/common/domain/src/lib/record'
+import { RouterFacade, SearchFacade } from 'geonetwork-ui'
+import { CatalogRecord } from 'geonetwork-ui/libs/common/domain/src/lib/model/record'
 
 @Component({
   selector: 'mel-datahub-search-results',
@@ -14,17 +10,6 @@ import { CatalogRecord } from 'geonetwork-ui/src/libs/common/domain/src/lib/reco
 })
 export class SearchResultsComponent implements OnInit {
   isQualitySortable = true
-  metadataQualityDisplay = {
-    widget: true,
-    title: true,
-    description: true,
-    contact: true,
-    keywords: true,
-    legalConstraints: true,
-    topic: true,
-    updateFrequency: true,
-    organisation: true,
-  } as MetadataQualityDisplay
 
   constructor(
     private searchRouter: RouterFacade,

diff --git a/apps/datahub/src/styles.css b/apps/datahub/src/styles.css
@@ -1,9 +1,9 @@
+@import 'geonetwork-ui/style.css';
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
 
-@import 'geonetwork-ui/style.css';
-
 @layer components {
   .mel-page-title {
     @apply text-black text-5xl font-extrabold font-title;