diff --git a/deploy/bkwdCompat/urlState.js b/deploy/bkwdCompat/urlState.js
index 881e79cb613e69ddffe5f29789d7164e868b6980..0f7e97130252adcb49dea755ce5818ec4f5ab15d 100644
--- a/deploy/bkwdCompat/urlState.js
+++ b/deploy/bkwdCompat/urlState.js
@@ -106,6 +106,8 @@ const templateMap = {
'Allen Mouse': allenObj
}
+const encodeId = id => id.replace(/\//g, '_')
+
module.exports = query => {
const {
standaloneVolumes,
@@ -131,29 +133,28 @@ module.exports = query => {
// to avoid potentially issues (e.g. url containing __, which is very possible)
const plugins = pluginStates && pluginStates.split('__')
-
let redirectUrl = '/#'
if (standaloneVolumes) {
redirectUrl += `/sv:${encodeURIComponent(standaloneVolumes)}`
if (cNavigation) redirectUrl += `/@:${encodeURIComponent(cNavigation)}`
if (previewingDatasetFiles) redirectUrl += `/dsp:${encodeURIComponent(previewingDatasetFiles)}`
- if (plugins && plugins.length > 0) redirectUrl += `/pl:${encodeURIComponent(plugins)}`
+ if (plugins && plugins.length > 0) redirectUrl += `/pl:${encodeURIComponent(JSON.stringify(plugins))}`
- if (niftiLayers) redirectUrl += `&niftiLayers=${encodeURIComponent(niftiLayers)}`
+ if (niftiLayers) redirectUrl += `?niftiLayers=${encodeURIComponent(niftiLayers)}`
return redirectUrl
}
if (templateSelected && templateMap[templateSelected]) {
const { id: t, aId: a, parc } = templateMap[templateSelected]
- redirectUrl += `/a:${encodeURIComponent(a)}/t:${encodeURIComponent(t)}`
+ redirectUrl += `/a:${encodeId(a)}/t:${encodeId(t)}`
const { id: p } = parc[parcellationSelected] || {}
- if (p) redirectUrl += `/p:${encodeURIComponent(p)}`
+ if (p) redirectUrl += `/p:${encodeId(p)}`
if (cRegionsSelected) redirectUrl += `/r:${encodeURIComponent(cRegionsSelected)}`
if (cNavigation) redirectUrl += `/@:${encodeURIComponent(cNavigation)}`
if (previewingDatasetFiles) redirectUrl += `/dsp:${encodeURIComponent(previewingDatasetFiles)}`
- if (plugins && plugins.length > 0) redirectUrl += `/pl:${encodeURIComponent(plugins)}`
+ if (plugins && plugins.length > 0) redirectUrl += `/pl:${encodeURIComponent(JSON.stringify(plugins))}`
- if (niftiLayers) redirectUrl += `&niftiLayers=${encodeURIComponent(niftiLayers)}`
+ if (niftiLayers) redirectUrl += `?niftiLayers=${encodeURIComponent(niftiLayers)}`
return redirectUrl
}
return null
diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js
index 103a6082e0bcbe4cc2a76c1b6e606169cb961411..44b20685fae5e095094e36b6482e52f6f4890333 100644
--- a/e2e/protractor.conf.js
+++ b/e2e/protractor.conf.js
@@ -43,13 +43,8 @@ const localConfig = {
if (typeof globalThis === 'undefined') global.globalThis = {}
jasmine.getEnv().addReporter({
specDone: async ({ status, id, fullName, ...rest }) => {
- if (status !== 'passed') {
- if (process.stdout.isTTY) {
- console.log(`\x1b[31m&s\x1b[0m`, 'F')
- console.log(`spec failed, taking screenshot`)
- } else {
- console.log(`F`)
- }
+ if (status === 'failed') {
+ console.log(`spec failed, taking screenshot`)
const b64 = await globalThis.IAVBase.takeScreenshot()
const dir = './scrnsht/'
await asyncMkdir(dir, { recursive: true })
diff --git a/e2e/src/advanced/urlParsing.prod.e2e-spec.js b/e2e/src/advanced/urlParsing.prod.e2e-spec.js
index 421797049ace21c96f1252c40d05445108500433..2d5b21418b020b1a8c1d3e5129661f4de951c695 100644
--- a/e2e/src/advanced/urlParsing.prod.e2e-spec.js
+++ b/e2e/src/advanced/urlParsing.prod.e2e-spec.js
@@ -86,20 +86,7 @@ describe('> url parsing', () => {
expect(red).toEqual(blue)
})
- it('> if niftiLayers is defined, after parsing, it should persist', async () => {
- const url = `/?templateSelected=MNI+152+ICBM+2009c+Nonlinear+Asymmetric&parcellationSelected=JuBrain+Cytoarchitectonic+Atlas&niftiLayers=https%3A%2F%2Fneuroglancer.humanbrainproject.eu%2Fprecomputed%2FJuBrain%2F17%2Ficbm152casym%2Fpmaps%2FVisual_hOc1_r_N10_nlin2MNI152ASYM2009C_2.4_publicP_a48ca5d938781ebaf1eaa25f59df74d0.nii.gz`
- await iavPage.goto(url)
- await iavPage.clearAlerts()
-
- // TODO use execScript from iavPage API
- const niftiLayers = await iavPage._driver.executeScript(() => {
- const search = new URLSearchParams(window.location.search)
- return search.get('niftiLayers')
- })
- const expected = `https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Visual_hOc1_r_N10_nlin2MNI152ASYM2009C_2.4_publicP_a48ca5d938781ebaf1eaa25f59df74d0.nii.gz`
- expect(niftiLayers).toEqual(expected)
- })
-
+ it('> if using niftilayers should show deprecation worning')
it('> pluginStates should result in xhr to get pluginManifest', async () => {
diff --git a/src/res/ext/allenMouseNehubaConfig.json b/src/res/ext/allenMouseNehubaConfig.json
index ee86f8d398edc3dfda2d5c3dd4622447b7f77c9b..e6ed7be2d1fe8d5f47ae27253be7375bc75ba5d1 100644
--- a/src/res/ext/allenMouseNehubaConfig.json
+++ b/src/res/ext/allenMouseNehubaConfig.json
@@ -115,7 +115,7 @@
},
"v3_2017": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.eu/precomputed/AMBA/parcellations/v3_2017",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.eu/precomputed/AMBA/parcellations/v3_2017",
"transform": [
[
0,
diff --git a/src/res/ext/bigbrainNehubaConfig.json b/src/res/ext/bigbrainNehubaConfig.json
index dfe249aa70b427876904d5a138d035056bd20280..941fd3fb2a8767a1052ea7cdec20aca6613152c4 100644
--- a/src/res/ext/bigbrainNehubaConfig.json
+++ b/src/res/ext/bigbrainNehubaConfig.json
@@ -95,7 +95,7 @@
},
"v1": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/BigBrainRelease.2015/2019_05_01_v1",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/BigBrainRelease.2015/2019_05_01_v1",
"segments": [
"0"
],
@@ -130,7 +130,7 @@
},
"v2": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/BigBrainRelease.2015/2019_05_01_v2",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/BigBrainRelease.2015/2019_05_01_v2",
"segments": [
"0"
],
@@ -165,7 +165,7 @@
},
"v3v": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_09_29_v3v",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_09_29_v3v",
"segments": [
"0"
],
@@ -200,7 +200,7 @@
},
"v5": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_09_29_v5",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_09_29_v5",
"segments": [
"0"
],
@@ -235,7 +235,7 @@
},
"interpolated": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/BigBrainRelease.2015/2019_05_22_interpolated_areas",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/BigBrainRelease.2015/2019_05_22_interpolated_areas",
"segments": [
"0"
],
@@ -270,7 +270,7 @@
},
"LGB-lam1": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_11_11_LGB-lam/LGB-lam1/",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_11_11_LGB-lam/LGB-lam1/",
"segments": [
"0"
],
@@ -305,7 +305,7 @@
},
"LGB-lam2": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_11_11_LGB-lam/LGB-lam2/",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_11_11_LGB-lam/LGB-lam2/",
"segments": [
"0"
],
@@ -340,7 +340,7 @@
},
"LGB-lam3": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_11_11_LGB-lam/LGB-lam3/",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_11_11_LGB-lam/LGB-lam3/",
"segments": [
"0"
],
@@ -375,7 +375,7 @@
},
"LGB-lam4": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_11_11_LGB-lam/LGB-lam4/",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_11_11_LGB-lam/LGB-lam4/",
"segments": [
"0"
],
@@ -410,7 +410,7 @@
},
"LGB-lam5": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_11_11_LGB-lam/LGB-lam5/",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_11_11_LGB-lam/LGB-lam5/",
"segments": [
"0"
],
@@ -445,7 +445,7 @@
},
"LGB-lam6": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_11_11_LGB-lam/LGB-lam6/",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/BigBrainRelease.2015/2020_11_11_LGB-lam/LGB-lam6/",
"segments": [
"0"
],
@@ -480,7 +480,7 @@
},
"cortical layers": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/BigBrainRelease.2015/2019_05_27_cortical_layers",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/BigBrainRelease.2015/2019_05_27_cortical_layers",
"selectedAlpha": 0.5,
"notSelectedAlpha": 0,
"transform": [
diff --git a/src/res/ext/waxholmRatV2_0NehubaConfig.json b/src/res/ext/waxholmRatV2_0NehubaConfig.json
index e98b6ee833f6a6cb86c857e9114b0ec3d9294f09..e67574b32c71ad6bbb6c02b9dba01a92b4207ace 100644
--- a/src/res/ext/waxholmRatV2_0NehubaConfig.json
+++ b/src/res/ext/waxholmRatV2_0NehubaConfig.json
@@ -114,7 +114,7 @@
},
"v1_01": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/WHS_SD_rat/parcellations/WHS_SD_rat_atlas_v1_01",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/WHS_SD_rat/parcellations/WHS_SD_rat_atlas_v1_01",
"selectedAlpha": 0.35,
"transform": [
[
@@ -176,7 +176,7 @@
},
"v3": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/WHS_SD_rat/parcellations/WHS_SD_rat_atlas_v3",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/WHS_SD_rat/parcellations/WHS_SD_rat_atlas_v3",
"selectedAlpha": 0.35,
"transform": [
[
@@ -207,7 +207,7 @@
},
"WHS_SD_rat_atlas_v4_beta": {
"type": "segmentation",
- "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/WHS_SD_rat/parcellations/WHS_SD_rat_atlas_v4_beta",
+ "source": "precomputed://https://neuroglancer.humanbrainproject.org/precomputed/WHS_SD_rat/parcellations/WHS_SD_rat_atlas_v4_beta",
"selectedAlpha": 0.35,
"transform": [
[
diff --git a/src/routerModule/router.service.spec.ts b/src/routerModule/router.service.spec.ts
index ef6505f89bef4d10355fe8c817c61fdd9ec3c17f..f389f56d2c428eacf7549a3af4ffcd75956fa179 100644
--- a/src/routerModule/router.service.spec.ts
+++ b/src/routerModule/router.service.spec.ts
@@ -137,23 +137,29 @@ describe('> router.service.ts', () => {
router = TestBed.inject(Router)
router.navigate(['foo', 'bar'])
- TestBed.inject(RouterService)
+ const service = TestBed.inject(RouterService)
tick()
expect(cvtFullRouteToStateSpy).toHaveBeenCalledWith(
- router.parseUrl('/foo/bar'), {}
+ router.parseUrl('/foo/bar'), {}, service['logError']
)
discardPeriodicTasks()
}))
- it('> calls cvtStateToHashedRoutes with returned states', fakeAsync(() => {
+ it('> calls cvtStateToHashedRoutes with current state', fakeAsync(() => {
const fakeParsedState = {
bizz: 'buzz'
}
+ const fakeState = {
+ foo: 'bar'
+ }
cvtFullRouteToStateSpy.and.callFake(() => fakeParsedState)
+ const store = TestBed.inject(MockStore)
+ store.setState(fakeState)
+
cvtStateToHashedRoutesSpy.and.callFake(() => {
return ['bizz', 'buzz']
})
@@ -164,7 +170,7 @@ describe('> router.service.ts', () => {
tick()
- expect(cvtStateToHashedRoutesSpy).toHaveBeenCalledWith(fakeParsedState)
+ expect(cvtStateToHashedRoutesSpy).toHaveBeenCalledWith(fakeState)
discardPeriodicTasks()
}))
@@ -214,29 +220,7 @@ describe('> router.service.ts', () => {
discardPeriodicTasks()
}))
- it('> ... returns same value, but firstRenderFlag is true, dispatches', fakeAsync(() => {
- const fakeParsedState = {
- bizz: 'buzz'
- }
- cvtFullRouteToStateSpy.and.callFake(() => fakeParsedState)
- cvtStateToHashedRoutesSpy.and.callFake(() => {
- return ['foo', 'bar']
- })
- router = TestBed.inject(Router)
- router.navigate(['foo', 'bar'])
-
- TestBed.inject(RouterService)
- const store = TestBed.inject(MockStore)
- const dispatchSpy = spyOn(store, 'dispatch')
-
- tick()
-
- expect(dispatchSpy).toHaveBeenCalled()
-
- discardPeriodicTasks()
- }))
-
- it('> ... returns same value, but firstRenderFlag is false, does not dispatches', fakeAsync(() => {
+ it('> ... returns same value, does not dispatches', fakeAsync(() => {
const fakeParsedState = {
bizz: 'buzz'
}
diff --git a/src/routerModule/router.service.ts b/src/routerModule/router.service.ts
index 566146194ae6ec7d5d5e8c316199672598674dc3..b4084a922c7405587b472f5400559503e8c8024c 100644
--- a/src/routerModule/router.service.ts
+++ b/src/routerModule/router.service.ts
@@ -4,7 +4,7 @@ import { Inject } from "@angular/core";
import { NavigationEnd, Router } from '@angular/router'
import { select, Store } from "@ngrx/store";
import { combineLatest, Observable } from "rxjs";
-import { debounceTime, filter, map, mapTo, shareReplay, switchMapTo, take, tap, withLatestFrom } from "rxjs/operators";
+import { debounceTime, filter, map, mapTo, shareReplay, switchMapTo, take, withLatestFrom } from "rxjs/operators";
import { viewerStateFetchedTemplatesSelector } from "src/services/state/viewerState.store.helper";
import { viewerStateFetchedAtlasesSelector } from "src/services/state/viewerState/selectors";
import { generalApplyState } from "src/services/stateStore.helper";
@@ -17,9 +17,12 @@ import { cvtStateToHashedRoutes, cvtFullRouteToState } from "./util";
export class RouterService {
- private firstRenderFlag = true
private allFetchingReady$: Observable<boolean>
+ private logError(...e: any[]) {
+ console.log(...e)
+ }
+
constructor(
router: Router,
pureConstantService: PureContantService,
@@ -68,32 +71,18 @@ export class RouterService {
)
).subscribe(([ev, state]: [NavigationEnd, any]) => {
const fullPath = ev.urlAfterRedirects
- const newState = cvtFullRouteToState(router.parseUrl(fullPath), state)
- let newUrl: any[]
+ const stateFromRoute = cvtFullRouteToState(router.parseUrl(fullPath), state, this.logError)
+ let routeFromState: string[]
try {
- newUrl = cvtStateToHashedRoutes(newState)
+ routeFromState = cvtStateToHashedRoutes(state)
} catch (_e) {
- console.error(`cvtStateToHashedRoutes error`, _e)
+ routeFromState = []
}
- // NB this is required, as parseUrl seems to decode %3A back to :
- // resulting in false positive
- const newRoute = newUrl && router.parseUrl(
- `/${newUrl.join('/')}`
- ).toString()
- const currentRoute = router.routerState.snapshot.url
-
- // this fn would in principle be invoked every time path changes
- // We are only interested in when path changes as a result of:
- // - on open
- // - on on history
- // on way to do this is by checking the updated route === current route
- // above scenarios would result in newRoute !== currentRoute
- if ( this.firstRenderFlag || newRoute !== currentRoute) {
- this.firstRenderFlag = false
+ if ( fullPath !== `/${routeFromState.join('/')}`) {
store$.dispatch(
generalApplyState({
- state: newState
+ state: stateFromRoute
})
)
}
@@ -119,8 +108,11 @@ export class RouterService {
if (routes.length === 0) {
router.navigate([ baseHref ])
} else {
+ const currUrl = router.routerState.snapshot.url
const joinedRoutes = `/${routes.join('/')}`
- router.navigateByUrl(joinedRoutes)
+ if (currUrl !== joinedRoutes) {
+ router.navigateByUrl(joinedRoutes)
+ }
}
})
}
diff --git a/src/routerModule/util.ts b/src/routerModule/util.ts
index 80b15ca998a2ef60fcdfdaa691d35215e08bdb6d..319fdbcf0ca44d89f63e0b99396a2ab26c393ca7 100644
--- a/src/routerModule/util.ts
+++ b/src/routerModule/util.ts
@@ -2,7 +2,7 @@ import { viewerStateGetSelectedAtlas, viewerStateSelectedParcellationSelector, v
import { encodeNumber, decodeToNumber, separator } from './cipher'
import { getGetRegionFromLabelIndexId } from 'src/util/fn'
import { serialiseParcellationRegion } from "common/util"
-import { UrlTree } from "@angular/router"
+import { UrlSegment, UrlTree } from "@angular/router"
import { getShader, PMAP_DEFAULT_CONFIG } from "src/util/constants"
import { mixNgLayers } from "src/services/state/ngViewerState.store"
import { PLUGINSTORE_CONSTANTS } from 'src/services/state/pluginState.store'
@@ -16,7 +16,8 @@ export const PARSE_ERROR = {
PARCELLATION_NOT_UPDATED: 'PARCELLATION_NOT_UPDATED',
}
-const encodeId = (id: string) => id.replace(/\//g, '_')
+const encodeId = (id: string) => id && id.replace(/\//g, '_')
+const decodeId = (codedId: string) => codedId && codedId.replace(/_/g, '/')
const endcodePath = (key: string, val: string) => `${key}:${encodeURIComponent(val)}`
const decodePath = (path: string) => {
const re = /^(.*?):(.+)$/.exec(path)
@@ -58,7 +59,7 @@ type TConditional = Partial<
type TUrlPathObj = (TUrlAtlas | TUrlStandaloneVolume) & TConditional
-function parseSearchParamForTemplateParcellationRegion(obj: TUrlPathObj, state: any) {
+function parseSearchParamForTemplateParcellationRegion(obj: TUrlPathObj, state: any, warnCb: Function) {
/**
* TODO if search param of either template or parcellation is incorrect, wrong things are searched
@@ -67,20 +68,21 @@ function parseSearchParamForTemplateParcellationRegion(obj: TUrlPathObj, state:
const templateSelected = (() => {
const { fetchedTemplates } = state.viewerState
- const searchedId = obj['t']
+ const searchedId = decodeId(obj['t'])
- if (!searchedId) { throw new Error(PARSE_ERROR.TEMPALTE_NOT_SET) }
+ if (!searchedId) return null
const templateToLoad = fetchedTemplates.find(template => (template['@id'] || template['fullId']) === searchedId)
if (!templateToLoad) { throw new Error(PARSE_ERROR.TEMPLATE_NOT_FOUND) }
return templateToLoad
})()
const parcellationSelected = (() => {
- const searchedId = obj['p']
+ if (!templateSelected) return null
+ const searchedId = decodeId(obj['p'])
- const parcellationToLoad = templateSelected.parcellations.find(parcellation => parcellation['@id'] || parcellation['fullId'] === searchedId)
+ const parcellationToLoad = templateSelected.parcellations.find(parcellation => (parcellation['@id'] || parcellation['fullId']) === searchedId)
if (!parcellationToLoad) {
- // catch error
+ warnCb(`parcellation with id ${searchedId} not found... load the first parc instead`)
}
return parcellationToLoad || templateSelected.parcellations[0]
})()
@@ -88,6 +90,7 @@ function parseSearchParamForTemplateParcellationRegion(obj: TUrlPathObj, state:
/* selected regions */
const regionsSelected = (() => {
+ if (!parcellationSelected) return []
// TODO deprecate. Fallback (defaultNgId) (should) already exist
// if (!viewerState.parcellationSelected.updated) throw new Error(PARCELLATION_NOT_UPDATED)
@@ -147,12 +150,13 @@ function parseSearchParamForTemplateParcellationRegion(obj: TUrlPathObj, state:
}
}
-export const cvtFullRouteToState = (fullPath: UrlTree, state) => {
+export const cvtFullRouteToState = (fullPath: UrlTree, state: any, _warnCb?: Function) => {
- if (!fullPath.root.hasChildren()) return state
- if (!fullPath.root.children['primary']) return state
+ const warnCb = _warnCb || ((...e: any[]) => console.warn(...e))
+ const pathFragments: UrlSegment[] = fullPath.root.hasChildren()
+ ? fullPath.root.children['primary'].segments
+ : []
- const pathFragments = fullPath.root.children['primary'].segments
const returnState = JSON.parse(JSON.stringify(state))
const returnObj: Partial<TUrlPathObj> = {}
@@ -209,11 +213,12 @@ export const cvtFullRouteToState = (fullPath: UrlTree, state) => {
// flag to allow for animation when enabled
animation: {},
}
- } catch (_e) {
+ } catch (e) {
/**
* TODO Poisoned encoded char
* send error message
*/
+ warnCb(`parse nav error`, e)
}
}
@@ -224,10 +229,11 @@ export const cvtFullRouteToState = (fullPath: UrlTree, state) => {
try {
const arrPluginStates = JSON.parse(pluginStates)
pluginState.initManifests = arrPluginStates.map(url => [PLUGINSTORE_CONSTANTS.INIT_MANIFEST_SRC, url] as [string, string])
- } catch (_e) {
+ } catch (e) {
/**
* parsing plugin error
*/
+ warnCb(`parse plugin states error`, e)
}
}
@@ -246,6 +252,7 @@ export const cvtFullRouteToState = (fullPath: UrlTree, state) => {
}
} catch (e) {
// parsing previewingDatasetFiles
+ warnCb(`parse dsp error`, e)
}
// If sv (standaloneVolume is defined)
@@ -259,14 +266,16 @@ export const cvtFullRouteToState = (fullPath: UrlTree, state) => {
returnState['viewerState']['standaloneVolumes'] = parsedArr
returnState['viewerState']['navigation'] = parsedNavObj
return returnState
- } catch (_e) {
+ } catch (e) {
// if any error occurs, parse rest per normal
+ warnCb(`parse standalone volume error`, e)
}
+ } else {
+ returnState['viewerState']['standaloneVolumes'] = []
}
try {
- const { parcellationSelected, regionsSelected, templateSelected } = parseSearchParamForTemplateParcellationRegion(returnObj as TUrlPathObj, state)
-
+ const { parcellationSelected, regionsSelected, templateSelected } = parseSearchParamForTemplateParcellationRegion(returnObj as TUrlPathObj, state, warnCb)
returnState['viewerState']['parcellationSelected'] = parcellationSelected
returnState['viewerState']['regionsSelected'] = regionsSelected
returnState['viewerState']['templateSelected'] = templateSelected
@@ -274,6 +283,7 @@ export const cvtFullRouteToState = (fullPath: UrlTree, state) => {
returnState['viewerState']['navigation'] = parsedNavObj
} catch (e) {
// if error, show error on UI?
+ warnCb(`parse template, parc, region error`, e)
}
/**
@@ -281,11 +291,11 @@ export const cvtFullRouteToState = (fullPath: UrlTree, state) => {
*/
(() => {
- const viewreHelperState = returnState[viewerStateHelperStoreName]
+ const viewreHelperState = returnState[viewerStateHelperStoreName] || {}
const { templateSelected, parcellationSelected } = returnState['viewerState']
const { fetchedAtlases, ...rest } = viewreHelperState
- const selectedAtlas = fetchedAtlases.find(a => a['templateSpaces'].find(t => t['@id'] === (templateSelected && templateSelected['@id'])))
+ const selectedAtlas = (fetchedAtlases || []).find(a => a['templateSpaces'].find(t => t['@id'] === (templateSelected && templateSelected['@id'])))
const overlayLayer = selectedAtlas && selectedAtlas['parcellations'].find(p => p['@id'] === (parcellationSelected && parcellationSelected['@id']))