diff --git a/e2e/src/iv.e2e-spec.js b/e2e/src/iv.e2e-spec.js index 736c7afec7789e88d854d97a5cc6cd2362057baf..edf7ae57bf16a3fbe2045b57789356dd352a0c94 100644 --- a/e2e/src/iv.e2e-spec.js +++ b/e2e/src/iv.e2e-spec.js @@ -120,8 +120,8 @@ describe('IAV', () => { it('pluginStates should result in call to fetch pluginManifest', async () => { const searchParam = new URLSearchParams() - searchParam.set('templateSelected', 'Big Brain (Histology)') - searchParam.set('parcellationSelected', 'Grey/White matter') + searchParam.set('templateSelected', 'MNI 152 ICBM 2009c Nonlinear Asymmetric') + searchParam.set('parcellationSelected', 'JuBrain Cytoarchitectonic Atlas') searchParam.set('pluginStates', 'http://localhost:3001/manifest.json') const page = await browser.newPage() diff --git a/src/atlasViewer/atlasViewer.urlUtil.ts b/src/atlasViewer/atlasViewer.urlUtil.ts index 1f0768cbdf3adb9bf1b0e3199c9d1cbb198a0f80..05b81ccbd55ab1c4488e630985f4fe8d6687b456 100644 --- a/src/atlasViewer/atlasViewer.urlUtil.ts +++ b/src/atlasViewer/atlasViewer.urlUtil.ts @@ -1,6 +1,6 @@ import { getGetRegionFromLabelIndexId } from "src/services/effect/effect"; import { mixNgLayers } from "src/services/state/ngViewerState.store"; -import { CONSTANTS as PLUGINSTORE_CONSTANTS } from 'src/services/state/pluginState.store' +import { PLUGINSTORE_CONSTANTS } from 'src/services/state/pluginState.store' import { generateLabelIndexId, getNgIdLabelIndexFromRegion, IavRootStoreInterface } from "../services/stateStore.service"; import { decodeToNumber, encodeNumber, GLSL_COLORMAP_JET, separator } from "./atlasViewer.constantService.service"; diff --git a/src/services/effect/pluginUseEffect.ts b/src/services/effect/pluginUseEffect.ts index d6489812360c61303b2767d97e65eb97ec3ed7b4..7298bdb2f818025146d3cb9151ddd3581624af96 100644 --- a/src/services/effect/pluginUseEffect.ts +++ b/src/services/effect/pluginUseEffect.ts @@ -5,7 +5,7 @@ import { Observable } from "rxjs" import { filter, map, startWith } from "rxjs/operators" import { AtlasViewerConstantsServices } from "src/atlasViewer/atlasViewer.constantService.service" import { PluginServices } from "src/atlasViewer/atlasViewer.pluginService.service" -import { ACTION_TYPES as PLUGINSTORE_ACTION_TYPES, CONSTANTS as PLUGINSTORE_CONSTANTS } from 'src/services/state/pluginState.store' +import { ACTION_TYPES as PLUGINSTORE_ACTION_TYPES, PLUGINSTORE_CONSTANTS } from 'src/services/state/pluginState.store' import { LoggingService } from "../logging.service" import { IavRootStoreInterface } from "../stateStore.service" diff --git a/src/services/state/pluginState.store.ts b/src/services/state/pluginState.store.ts index d8a603dce996207a2c21faafa12fcaefba94d288..030806e8694ddeeaea791b9d7934f0d3de712316 100644 --- a/src/services/state/pluginState.store.ts +++ b/src/services/state/pluginState.store.ts @@ -21,7 +21,7 @@ export const ACTION_TYPES = { CLEAR_INIT_PLUGIN: 'CLEAR_INIT_PLUGIN', } -export const CONSTANTS = { +export const PLUGINSTORE_CONSTANTS = { INIT_MANIFEST_SRC: 'INIT_MANIFEST_SRC', } @@ -31,7 +31,7 @@ export const getStateStore = ({ state = defaultState } = {}) => (prevState: Stat const newMap = new Map(prevState.initManifests ) // reserved source label for init manifest - if (action.manifest.name !== CONSTANTS.INIT_MANIFEST_SRC) { newMap.set(action.manifest.name, action.manifest.initManifestUrl) } + if (action.manifest.name !== PLUGINSTORE_CONSTANTS.INIT_MANIFEST_SRC) { newMap.set(action.manifest.name, action.manifest.initManifestUrl) } return { ...prevState, initManifests: Array.from(newMap), @@ -39,7 +39,7 @@ export const getStateStore = ({ state = defaultState } = {}) => (prevState: Stat } case ACTION_TYPES.CLEAR_INIT_PLUGIN: { const { initManifests } = prevState - const newManifests = initManifests.filter(([source]) => source !== CONSTANTS.INIT_MANIFEST_SRC) + const newManifests = initManifests.filter(([source]) => source !== PLUGINSTORE_CONSTANTS.INIT_MANIFEST_SRC) return { ...prevState, initManifests: newManifests,