From f36b6790714b2b3d5bb1f1838c74da6db443ea8c Mon Sep 17 00:00:00 2001 From: Olivia Guyot Date: Mon, 28 Oct 2024 13:25:10 +0100 Subject: [PATCH 1/3] chore: update ogc-client --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 894ab90ad..46bc3b7b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "@angular/router": "^16.2", "@bartholomej/ngx-translate-extract": "^8.0.2", "@biesbjerg/ngx-translate-extract-marker": "^1.0.0", - "@camptocamp/ogc-client": "1.1.1-dev.407854b", + "@camptocamp/ogc-client": "1.1.1-dev.3e2d3cc", "@geospatial-sdk/core": "0.0.5-dev.29", "@geospatial-sdk/geocoding": "0.0.5-dev.29", "@geospatial-sdk/openlayers": "0.0.5-dev.29", @@ -3744,9 +3744,9 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@camptocamp/ogc-client": { - "version": "1.1.1-dev.407854b", - "resolved": "https://registry.npmjs.org/@camptocamp/ogc-client/-/ogc-client-1.1.1-dev.407854b.tgz", - "integrity": "sha512-kfD4L2xZGrbSn9xTfR3t3b7hKlZhl37VnY9NTFqUS1Tk+kP7Eub2aaa9IemULLKo3CTzE/c7Aj/GwSncSMMYEA==", + "version": "1.1.1-dev.3e2d3cc", + "resolved": "https://registry.npmjs.org/@camptocamp/ogc-client/-/ogc-client-1.1.1-dev.3e2d3cc.tgz", + "integrity": "sha512-k6OreeiqHHiwFP1Bqvj+t9V57o878OVYNwL+Z9m0yxWWd3kgc4JW0pgLTBBpUmKIPir78mxUVxgYE2loCy9R7g==", "dependencies": { "@rgrove/parse-xml": "^4.1.0", "node-fetch": "^3.3.1" diff --git a/package.json b/package.json index f6c4e6c40..9aa9fd2f2 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "@angular/router": "^16.2", "@bartholomej/ngx-translate-extract": "^8.0.2", "@biesbjerg/ngx-translate-extract-marker": "^1.0.0", - "@camptocamp/ogc-client": "1.1.1-dev.407854b", + "@camptocamp/ogc-client": "1.1.1-dev.3e2d3cc", "@geospatial-sdk/core": "0.0.5-dev.29", "@geospatial-sdk/geocoding": "0.0.5-dev.29", "@geospatial-sdk/openlayers": "0.0.5-dev.29", From ef56d05572c3895d3b52077f28536ba5cc57c16f Mon Sep 17 00:00:00 2001 From: Olivia Guyot Date: Mon, 28 Oct 2024 21:07:10 +0100 Subject: [PATCH 2/3] chore(DH): do not inject undefined for basemap layers token --- apps/datahub/src/app/app.module.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/datahub/src/app/app.module.ts b/apps/datahub/src/app/app.module.ts index a624c9404..37e7513ca 100644 --- a/apps/datahub/src/app/app.module.ts +++ b/apps/datahub/src/app/app.module.ts @@ -274,7 +274,8 @@ export const metaReducers: MetaReducer[] = !environment.production ? [] : [] { provide: BASEMAP_LAYERS, useFactory: () => - getOptionalMapConfig()?.MAP_LAYERS.map(getMapContextLayerFromConfig), + getOptionalMapConfig()?.MAP_LAYERS.map(getMapContextLayerFromConfig) ?? + [], }, { provide: MAP_VIEW_CONSTRAINTS, From c51362e62fbdeae59f3dd5bc714dfc7cc5d5fea1 Mon Sep 17 00:00:00 2001 From: Olivia Guyot Date: Mon, 28 Oct 2024 21:23:23 +0100 Subject: [PATCH 3/3] e2e(DH): fix mock WFS urls ogc-client now uses the proper WFS download urls (as advertised in the capabilities document) so they need to be adjusted in the e2e tests. --- apps/datahub-e2e/src/e2e/datasetDetailPage.cy.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/datahub-e2e/src/e2e/datasetDetailPage.cy.ts b/apps/datahub-e2e/src/e2e/datasetDetailPage.cy.ts index dbc87357a..088b06fb4 100644 --- a/apps/datahub-e2e/src/e2e/datasetDetailPage.cy.ts +++ b/apps/datahub-e2e/src/e2e/datasetDetailPage.cy.ts @@ -26,14 +26,14 @@ beforeEach(() => { ) cy.intercept( 'GET', - '/geoserver/insee/ows?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=insee%3Arectangles_200m_menage_erbm&OUTPUTFORMAT=application%2Fjson*', + '/geoserver/insee/wfs?SERVICE=WFS&REQUEST=GetFeature&VERSION=2.0.0&TYPENAMES=insee%3Arectangles_200m_menage_erbm&OUTPUTFORMAT=application%2Fjson*', { fixture: 'insee-rectangles_200m_menage_erbm.json', } ) cy.intercept( 'GET', - '/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', { fixture: 'insee-rectangles_200m_menage_erbm.csv', } @@ -489,7 +489,7 @@ describe('dataset pages', () => { .find('gn-ui-download-item') .first() .click() - cy.readFile(path.join('cypress/downloads', 'ows.csv')).as( + cy.readFile(path.join('cypress/downloads', 'wfs.csv')).as( 'downloadedFile' ) cy.get('@downloadedFile').should('exist')