From 37fc1ebf577d81be356b1894982e987504588594 Mon Sep 17 00:00:00 2001 From: Xiao Gui <xgui3783@gmail.com> Date: Tue, 9 Jun 2020 18:33:56 +0200 Subject: [PATCH] chore: fix pli e2e test chore: changed sptial transform endpoint --- e2e/src/advanced/nonAtlasImages.prod.e2e-spec.js | 4 ++-- src/services/templateCoordinatesTransformation.service.ts | 2 +- typings/index.d.ts | 1 + webpack.staticassets.js | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/e2e/src/advanced/nonAtlasImages.prod.e2e-spec.js b/e2e/src/advanced/nonAtlasImages.prod.e2e-spec.js index 89d645b7d..26bdfb011 100644 --- a/e2e/src/advanced/nonAtlasImages.prod.e2e-spec.js +++ b/e2e/src/advanced/nonAtlasImages.prod.e2e-spec.js @@ -114,7 +114,7 @@ describe('> non-atlas images', () => { ) ) - const arr = [ + const arrPli = [ "https://neuroglancer.humanbrainproject.eu/precomputed/PLI_FOM/BI-FOM-HSV_R", "https://neuroglancer.humanbrainproject.eu/precomputed/PLI_FOM/BI-FOM-HSV_G", "https://neuroglancer.humanbrainproject.eu/precomputed/PLI_FOM/BI-FOM-HSV_B", @@ -135,7 +135,7 @@ describe('> non-atlas images', () => { ) ) - for (const url of arr) { + for (const url of arrPli) { expect( interceptedCalls ).toContain( diff --git a/src/services/templateCoordinatesTransformation.service.ts b/src/services/templateCoordinatesTransformation.service.ts index 1329fe942..6aaf98b99 100644 --- a/src/services/templateCoordinatesTransformation.service.ts +++ b/src/services/templateCoordinatesTransformation.service.ts @@ -16,7 +16,7 @@ export class TemplateCoordinatesTransformation { constructor(private httpClient: HttpClient) {} - public url = 'https://hbp-spatial-backend.apps-dev.hbp.eu/v1/transform-points' + public url = `${SPATIAL_TRANSFORM_BACKEND.replace(/\/$/, '')}/v1/transform-points` // jasmine marble cannot test promise properly // see https://github.com/ngrx/platform/issues/498#issuecomment-337465179 diff --git a/typings/index.d.ts b/typings/index.d.ts index 2fb1dc3a1..912053cac 100644 --- a/typings/index.d.ts +++ b/typings/index.d.ts @@ -21,3 +21,4 @@ declare var MATOMO_URL: string declare var MATOMO_ID: string declare var STRICT_LOCAL: boolean declare var KIOSK_MODE: boolean +declare var SPATIAL_TRANSFORM_BACKEND: string diff --git a/webpack.staticassets.js b/webpack.staticassets.js index b58015543..163b00926 100644 --- a/webpack.staticassets.js +++ b/webpack.staticassets.js @@ -72,6 +72,7 @@ module.exports = { PRODUCTION: !!process.env.PRODUCTION, BACKEND_URL: (process.env.BACKEND_URL && JSON.stringify(process.env.BACKEND_URL)) || 'null', DATASET_PREVIEW_URL: JSON.stringify(process.env.DATASET_PREVIEW_URL || 'https://hbp-kg-dataset-previewer.apps.hbp.eu/datasetPreview'), + SPATIAL_TRANSFORM_BACKEND: JSON.stringify(process.env.SPATIAL_TRANSFORM_BACKEND || 'https://hbp-spatial-backend.apps.hbp.eu'), MATOMO_URL: JSON.stringify(process.env.MATOMO_URL || null), MATOMO_ID: JSON.stringify(process.env.MATOMO_ID || null), USE_LOGO: JSON.stringify(process.env.USE_LOGO || 'hbp' || 'ebrains' || 'fzj'), -- GitLab