Merge pull request #126 from camptocamp/migrate-angular-18

Migrate angular to 18
camptocamp · Feb 13, 2025 · b7570f0 · b7570f0
2 parents 6ca0cc3 + 346cc92
commit b7570f0
Show file tree

Hide file tree

Showing 12 changed files with 14,373 additions and 21,415 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 name: CI
 
 env:
-  NODE_VERSION: 18.16.1
+  NODE_VERSION: 20.18.1
 
 on:
   push:

diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,4 @@ Thumbs.db
 
 .nx/cache
 .angular
+.nx/
diff --git a/apps/datahub-e2e/src/e2e/dataset.cy.ts b/apps/datahub-e2e/src/e2e/dataset.cy.ts
@@ -298,7 +298,7 @@ describe('datasets', () => {
           .as('downloadLink')
         cy.get('@downloadLink').should(
           'contain',
-          '/geoserver/insee/ows?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=insee%3Arectangles_200m_menage_erbm&OUTPUTFORMAT=csv'
+          '/geoserver/insee/wfs?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=insee%3Arectangles_200m_menage_erbm&OUTPUTFORMAT=csv'
         )
         cy.get('[data-cy="download-button"]')
           .first()

diff --git a/apps/datahub/src/app/app.module.ts b/apps/datahub/src/app/app.module.ts
@@ -155,7 +155,10 @@ import { matMoreHoriz } from '@ng-icons/material-icons/baseline'
       }
     ),
     EffectsModule.forRoot([]),
-    StoreDevtoolsModule.instrument({ logOnly: !isDevMode() }),
+    StoreDevtoolsModule.instrument({
+      logOnly: !isDevMode(),
+      connectInZone: true,
+    }),
     RouterModule.forRoot([], {
       initialNavigation: 'enabledBlocking',
       scrollPositionRestoration: 'enabled',

diff --git a/apps/datahub/src/app/search/search-filters/search-filters.component.ts b/apps/datahub/src/app/search/search-filters/search-filters.component.ts
@@ -18,6 +18,7 @@ marker('mel.datahub.search.filters.keyword')
 marker('mel.datahub.search.filters.isSpatial')
 marker('mel.datahub.search.filters.resourceType')
 marker('mel.datahub.search.filters.representationType')
+marker('mel.datahub.search.filters.revisionYear')
 
 @Component({
   selector: 'mel-datahub-search-filters',

diff --git a/apps/home/src/app/app.module.ts b/apps/home/src/app/app.module.ts
@@ -50,7 +50,10 @@ import { HomePageComponent } from './home/home-page/home-page.component'
       }
     ),
     EffectsModule.forRoot([]),
-    StoreDevtoolsModule.instrument({ logOnly: !isDevMode() }),
+    StoreDevtoolsModule.instrument({
+      logOnly: !isDevMode(),
+      connectInZone: true,
+    }),
   ],
   providers: [
     importProvidersFrom(FeatureAuthModule),

diff --git a/libs/mel/src/lib/results-list/results-list.component.ts b/libs/mel/src/lib/results-list/results-list.component.ts
@@ -58,14 +58,18 @@ export class ResultsListComponent implements OnInit, OnDestroy {
   }
 
   onInfoKeywordClick(keyword: Keyword) {
-    this.routerFacade
-      ? this.routerFacade.updateSearch({ q: keyword.label })
-      : goFromHomeToSearch(keyword.label)
+    if (this.routerFacade) {
+      this.routerFacade.updateSearch({ q: keyword.label })
+    } else {
+      goFromHomeToSearch(keyword.label)
+    }
   }
 
   onMetadataSelection(metadata: CatalogRecord): void {
-    this.routerFacade
-      ? this.routerFacade.goToMetadata(metadata)
-      : goFromHomeToRecord(metadata)
+    if (this.routerFacade) {
+      this.routerFacade.goToMetadata(metadata)
+    } else {
+      goFromHomeToRecord(metadata)
+    }
   }
 }
diff --git a/libs/mel/src/lib/route.utils.ts b/libs/mel/src/lib/route.utils.ts
@@ -5,9 +5,11 @@ export const DATAHUB_ROUTE_DATASET = 'dataset'
 export const DATAHUB_ROUTE_SEARCH = 'search'
 
 export function goFromHomeToRecord(record: CatalogRecord) {
-  window.location.href = `${DATAHUB_ROOT}/${DATAHUB_ROUTE_DATASET}/${record.uniqueIdentifier}`
+  window.location.assign(
+    `${DATAHUB_ROOT}/${DATAHUB_ROUTE_DATASET}/${record.uniqueIdentifier}`
+  )
 }
 
 export function goFromHomeToSearch(query: string) {
-  window.location.href = `${DATAHUB_ROOT}/${DATAHUB_ROUTE_SEARCH}?q=${query}`
+  window.location.assign(`${DATAHUB_ROOT}/${DATAHUB_ROUTE_SEARCH}?q=${query}`)
 }