diff --git a/docs/releases/v2.1.0.md b/docs/releases/v2.1.0.md index 3e2195a87b657b31e74c0c2bdfd514e6e3d5d2cc..0a6223d8c9a5eeb3fbab5280b2417c8258a031dd 100644 --- a/docs/releases/v2.1.0.md +++ b/docs/releases/v2.1.0.md @@ -1,7 +1,14 @@ # v2.1.0 -New features: +## New features: + - Region search also searches for relatedAreas - updating the querying logic of datasets - connectivity browsing for JuBrain atlas -- allow for added layer opacity to be changed \ No newline at end of file +- allow for added layer opacity to be changed +- trans template + +## Bugfixes + +- Fixed a bug where on parcellation load, the colour of the parcellation fails to load (#454, #462) +- Fixed a bug where, URL state is no longer parsed as state properly (#461) diff --git a/src/atlasViewer/atlasViewer.pluginService.service.ts b/src/atlasViewer/atlasViewer.pluginService.service.ts index 2dbed3b36fe35d3bae5eb28e165167b77fa8d860..3c02c791f16e49ca05e918594a2f77249d20ed87 100644 --- a/src/atlasViewer/atlasViewer.pluginService.service.ts +++ b/src/atlasViewer/atlasViewer.pluginService.service.ts @@ -1,6 +1,6 @@ import { HttpClient } from '@angular/common/http' import { ComponentFactory, ComponentFactoryResolver, Injectable, NgZone, ViewContainerRef } from "@angular/core"; -import { ACTION_TYPES as PLUGIN_STATE_ACTION_TYPES } from "src/services/state/pluginState.store"; +import { PLUGINSTORE_ACTION_TYPES } from "src/services/state/pluginState.store"; import { IavRootStoreInterface, isDefined } from 'src/services/stateStore.service' import { AtlasViewerAPIServices } from "./atlasViewer.apiService.service"; import { PluginUnit } from "./pluginUnit/pluginUnit.component"; @@ -231,7 +231,7 @@ export class PluginServices { : null handler.setInitManifestUrl = (url) => this.store.dispatch({ - type : PLUGIN_STATE_ACTION_TYPES.SET_INIT_PLUGIN, + type : PLUGINSTORE_ACTION_TYPES.SET_INIT_PLUGIN, manifest : { name : plugin.name, initManifestUrl : url, diff --git a/src/main-common.ts b/src/main-common.ts index f20dbd91dcc4bdb56aeb68db06b1f85333f8a72e..77b3a59dfe1a4bd9d76a4dd18ad718a9f95e30f8 100644 --- a/src/main-common.ts +++ b/src/main-common.ts @@ -2,8 +2,8 @@ import 'zone.js' import 'third_party/testSafari.js' import { enableProdMode } from '@angular/core'; -import { defineCustomElements as defineConnectivityComponent } from 'hbp-connectivity-component/dist/loader' -import { defineCustomElements as definePreviewComponent } from 'kg-dataset-previewer/loader' +import * as ConnectivityComponent from 'hbp-connectivity-component/dist/loader' +import * as PreviewDatasetComponent from 'kg-dataset-previewer/loader' import { platformBrowserDynamic } from '@angular/platform-browser-dynamic' import { MainModule } from './main.module'; @@ -17,5 +17,5 @@ requireAll(require.context(`./plugin_examples`, true)) platformBrowserDynamic().bootstrapModule(MainModule) -defineConnectivityComponent(window) -definePreviewComponent(window) \ No newline at end of file +PreviewDatasetComponent.defineCustomElements(window) +ConnectivityComponent.defineCustomElements(window) \ No newline at end of file diff --git a/src/services/effect/pluginUseEffect.ts b/src/services/effect/pluginUseEffect.ts index 7298bdb2f818025146d3cb9151ddd3581624af96..4cd7964b9b8dc525ef38af4abe517b5ba9b2477a 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, PLUGINSTORE_CONSTANTS } from 'src/services/state/pluginState.store' +import { 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 030806e8694ddeeaea791b9d7934f0d3de712316..de5b76754c0ea0af759923d62610ce30a3acf7ef 100644 --- a/src/services/state/pluginState.store.ts +++ b/src/services/state/pluginState.store.ts @@ -16,7 +16,7 @@ export interface ActionInterface extends Action { } } -export const ACTION_TYPES = { +export const PLUGINSTORE_ACTION_TYPES = { SET_INIT_PLUGIN: `SET_INIT_PLUGIN`, CLEAR_INIT_PLUGIN: 'CLEAR_INIT_PLUGIN', } @@ -27,7 +27,7 @@ export const PLUGINSTORE_CONSTANTS = { export const getStateStore = ({ state = defaultState } = {}) => (prevState: StateInterface = state, action: ActionInterface): StateInterface => { switch (action.type) { - case ACTION_TYPES.SET_INIT_PLUGIN: { + case PLUGINSTORE_ACTION_TYPES.SET_INIT_PLUGIN: { const newMap = new Map(prevState.initManifests ) // reserved source label for init manifest @@ -37,7 +37,7 @@ export const getStateStore = ({ state = defaultState } = {}) => (prevState: Stat initManifests: Array.from(newMap), } } - case ACTION_TYPES.CLEAR_INIT_PLUGIN: { + case PLUGINSTORE_ACTION_TYPES.CLEAR_INIT_PLUGIN: { const { initManifests } = prevState const newManifests = initManifests.filter(([source]) => source !== PLUGINSTORE_CONSTANTS.INIT_MANIFEST_SRC) return {