From 5736223929afc511f0305e7445816f340b9c7a98 Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Mon, 2 Aug 2021 12:21:51 +0200
Subject: [PATCH] hotfix: julichbrain v251 url chore: lint
---
deploy/bkwdCompat/urlState.js | 5 +++--
docs/releases/v2.4.1.md | 5 +++++
mkdocs.yml | 1 +
package.json | 2 +-
.../nehuba/layerCtrl.service/layerCtrl.service.ts | 4 ++--
5 files changed, 12 insertions(+), 5 deletions(-)
create mode 100644 docs/releases/v2.4.1.md
diff --git a/deploy/bkwdCompat/urlState.js b/deploy/bkwdCompat/urlState.js
index 3c41eb3c2..dd5331e3e 100644
--- a/deploy/bkwdCompat/urlState.js
+++ b/deploy/bkwdCompat/urlState.js
@@ -57,7 +57,8 @@ const templateMap = {
id: 'minds/core/referencespace/v1.0.0/dafcffc5-4826-4bf1-8ff6-46b8a31ff8e2',
parc: {
'Cytoarchitectonic Maps - v2.5.1': {
- id: 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-26'
+ // redirect julich brain v251 to v290
+ id: 'minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-290'
},
'Short Fiber Bundles - HCP': {
id: 'juelich/iav/atlas/v1.0.0/79cbeaa4ee96d5d3dfe2876e9f74b3dc3d3ffb84304fb9b965b1776563a1069c'
@@ -222,7 +223,7 @@ module.exports = (query, _warningCb) => {
}
const { id: p } = parc[parcellationSelected] || {}
if (p) redirectUrl += `/p:${encodeId(p)}`
- if (r) redirectUrl += r
+ if (r && parcellationSelected !== 'Cytoarchitectonic Maps - v2.5.1') redirectUrl += r
if (nav) redirectUrl += nav
if (dsp) redirectUrl += dsp
diff --git a/docs/releases/v2.4.1.md b/docs/releases/v2.4.1.md
new file mode 100644
index 000000000..da64e9b3c
--- /dev/null
+++ b/docs/releases/v2.4.1.md
@@ -0,0 +1,5 @@
+# v2.4.1
+
+## Bugfixes
+
+- fix JulichBrain v2.5.0 URL redirection
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index b09aa94d7..7ebc2aece 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -40,6 +40,7 @@ pages:
- Fetching datasets: 'advanced/datasets.md'
- Display non-atlas volumes: 'advanced/otherVolumes.md'
- Release notes:
+ - v2.4.1: 'releases/v2.4.1.md'
- v2.4.0: 'releases/v2.4.0.md'
- v2.3.11: 'releases/v2.3.11.md'
- v2.3.10: 'releases/v2.3.10.md'
diff --git a/package.json b/package.json
index b35b456f2..2587e015c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "interactive-viewer",
- "version": "2.4.0",
+ "version": "2.4.1",
"description": "HBP interactive atlas viewer. Integrating KG query, dataset previews & more. Based on humanbrainproject/nehuba & google/neuroglancer. Built with angular",
"scripts": {
"build-aot": "PRODUCTION=true GIT_HASH=`node -e 'console.log(require(\"./package.json\").version)'` webpack --config ./webpack/webpack.aot.js && node ./third_party/matomo/processMatomo.js",
diff --git a/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.service.ts b/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.service.ts
index 43b6d922a..d3232e3e0 100644
--- a/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.service.ts
+++ b/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.service.ts
@@ -148,7 +148,7 @@ export class NehubaLayerControlService implements OnDestroy{
}
private pliVol$: Observable<string[]> = this._pliVol$
- ? this._pliVol$.pipe(
+ ? this._pliVol$.pipe(
map(arr => {
const output = []
for (const item of arr) {
@@ -159,7 +159,7 @@ export class NehubaLayerControlService implements OnDestroy{
return output
})
)
- : NEVER
+ : NEVER
constructor(
private store$: Store<any>,
@Optional() @Inject(_PLI_VOLUME_INJ_TOKEN) private _pliVol$: Observable<_TPLIVal[]>,
--
GitLab