diff --git a/common/constants.js b/common/constants.js
index 0b92fb901782e568b9c8f2db52f9f7c9a79156b3..d3fe2b2b308520de3e5e9142d58b681c9dbc2a5a 100644
--- a/common/constants.js
+++ b/common/constants.js
@@ -163,5 +163,6 @@ If you do not accept the Terms & Conditions you are not permitted to access or u
}
exports.QUICKTOUR_DESC_MD = {
+ SLICE_VIEW: `The planar views allow you to zoom \`[mouse wheel]\`, pan the view \`[drag]\`, and select oblique sections \`<shift>\` + \`[drag]\`. You can \`[click]\` any brain regions to select them.`
}
})(typeof exports === 'undefined' ? module.exports : exports)
diff --git a/deploy/csp/index.js b/deploy/csp/index.js
index e976dd482d2845490dd24bebef212ea1ab0aeb17..e48f7f155e90e027e0274590f854d7281ca83bad 100644
--- a/deploy/csp/index.js
+++ b/deploy/csp/index.js
@@ -115,7 +115,7 @@ module.exports = {
'https://unpkg.com/d3@6.2.0/', // required for preview component
'https://unpkg.com/mathjax@3.1.2/', // math jax
'https://unpkg.com/three-surfer@0.0.13/dist/bundle.js', // for threeSurfer (freesurfer support in browser)
- 'https://unpkg.com/ng-layer-tune@0.0.12/dist/ng-layer-tune/', // needed for ng layer control
+ 'https://unpkg.com/ng-layer-tune@0.0.13/dist/ng-layer-tune/', // needed for ng layer control
'https://unpkg.com/hbp-connectivity-component@0.6.6/', // needed for connectivity component
(req, res) => res.locals.nonce ? `'nonce-${res.locals.nonce}'` : null,
...SCRIPT_SRC,
diff --git a/docs/releases/v2.11.2.md b/docs/releases/v2.11.2.md
new file mode 100644
index 0000000000000000000000000000000000000000..cd4023f5a6b472d7942fb5badd23c95b62430530
--- /dev/null
+++ b/docs/releases/v2.11.2.md
@@ -0,0 +1,15 @@
+# v2.11.2
+
+## Features
+
+- Allow external layer control to persist state (#1338)
+
+
+## Bugfixes
+
+- Fixed neuron display
+- Fixed typos in plugin API messages
+
+## Behind the scenes
+
+- Pass messages to plugin API when not handled
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index df2d3dcc9969d727dc219a4a2450f0da70533330..fc88fe80be9e51f1591d52834ece4a8698b79ef5 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -33,6 +33,7 @@ nav:
- Fetching datasets: 'advanced/datasets.md'
- Display non-atlas volumes: 'advanced/otherVolumes.md'
- Release notes:
+ - v2.11.2: 'releases/v2.11.2.md'
- v2.11.1: 'releases/v2.11.1.md'
- v2.11.0: 'releases/v2.11.0.md'
- v2.10.3: 'releases/v2.10.3.md'
diff --git a/package.json b/package.json
index 9719e8ac3d423f69b3e79bc3c266675522175327..4ea49304574b3072c6f16f5690b98a624b3558ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "siibra-explorer",
- "version": "2.11.1",
+ "version": "2.11.2",
"description": "siibra-explorer - explore brain atlases. Based on humanbrainproject/nehuba & google/neuroglancer. Built with angular",
"scripts": {
"lint": "eslint src --ext .ts",
diff --git a/src/api/service.ts b/src/api/service.ts
index 6adceb099682923f5306647b857346dca23b1aa3..44520f13f9a2958437463fb45793a925ee5b5aec 100644
--- a/src/api/service.ts
+++ b/src/api/service.ts
@@ -172,7 +172,7 @@ const broadCastDefault: BroadCastingApiEvents = {
export class ApiService implements BoothResponder<ApiBoothEvents>{
- public broadcastCh = createBroadcastingJsonRpcChannel<`${NAMESPACE_TYPE}.on`, BroadCastingApiEvents>(`${namespace}.on`, broadCastDefault)
+ public broadcastCh = createBroadcastingJsonRpcChannel<`${NAMESPACE_TYPE}.on.`, BroadCastingApiEvents>(`${namespace}.on.`, broadCastDefault)
public booth = new Booth<ApiBoothEvents>(this)
private requestUserQueue: RequestUser<keyof RequestUserTypes>[] = []
@@ -263,27 +263,27 @@ export class ApiService implements BoothResponder<ApiBoothEvents>{
this.store.pipe(
select(atlasSelection.selectors.selectedAtlas)
).subscribe(atlas => {
- this.broadcastCh.emit('atlasSelected', translateV3Entities.retrieveAtlas(atlas))
+ this.broadcastCh.emit('atlasSelected', atlas && translateV3Entities.retrieveAtlas(atlas))
})
this.store.pipe(
select(atlasSelection.selectors.selectedParcellation)
).subscribe(parcellation => {
- this.broadcastCh.emit('parcellationSelected', translateV3Entities.retrieveParcellation(parcellation))
+ this.broadcastCh.emit('parcellationSelected', parcellation && translateV3Entities.retrieveParcellation(parcellation))
})
this.store.pipe(
select(atlasSelection.selectors.selectedTemplate)
).subscribe(template => {
- this.broadcastCh.emit('templateSelected', translateV3Entities.retrieveTemplate(template))
+ this.broadcastCh.emit('templateSelected', template && translateV3Entities.retrieveTemplate(template))
})
this.store.pipe(
select(atlasSelection.selectors.selectedRegions)
).subscribe(regions => {
- this.broadcastCh.emit('regionsSelected', regions.map(reg => translateV3Entities.retrieveRegion(reg)))
+ this.broadcastCh.emit('regionsSelected', regions && regions.map(reg => translateV3Entities.retrieveRegion(reg)))
})
this.store.pipe(
select(atlasSelection.selectors.selectedParcAllRegions)
).subscribe(regions => {
- this.broadcastCh.emit('allRegions', regions.map(reg => translateV3Entities.retrieveRegion(reg)))
+ this.broadcastCh.emit('allRegions', regions && regions.map(reg => translateV3Entities.retrieveRegion(reg)))
})
this.store.pipe(
select(atlasSelection.selectors.navigation)
diff --git a/src/features/entry/entry.component.ts b/src/features/entry/entry.component.ts
index 722fd8e99735fb88a04ab0435c6a0bccaa760306..439deee00bfe54122ca8bd0df9ce38359019f362 100644
--- a/src/features/entry/entry.component.ts
+++ b/src/features/entry/entry.component.ts
@@ -128,7 +128,6 @@ export class EntryComponent extends FeatureBase implements AfterViewInit, OnDest
await ds.pull()
} catch (e) {
if (e instanceof DsExhausted) {
- console.log('exhausted')
break
}
if (e instanceof IsAlreadyPulling ) {
diff --git a/src/index.html b/src/index.html
index c1cef937495c9ed9218e6ec90326307b07a8816e..1ed2d8187899e51442bc39c8ab9305ac15c7ea0f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -14,7 +14,7 @@
<script src="extra_js.js"></script>
<script src="https://unpkg.com/kg-dataset-previewer@1.2.0/dist/kg-dataset-previewer/kg-dataset-previewer.js" defer></script>
<script src="https://unpkg.com/three-surfer@0.0.13/dist/bundle.js" defer></script>
- <script type="module" src="https://unpkg.com/ng-layer-tune@0.0.12/dist/ng-layer-tune/ng-layer-tune.esm.js"></script>
+ <script type="module" src="https://unpkg.com/ng-layer-tune@0.0.13/dist/ng-layer-tune/ng-layer-tune.esm.js"></script>
<script type="module" src="https://unpkg.com/hbp-connectivity-component@0.6.6/dist/connectivity-component/connectivity-component.js" ></script>
<script defer src="https://unpkg.com/mathjax@3.1.2/es5/tex-svg.js"></script>
<script defer src="https://unpkg.com/d3@6.2.0/dist/d3.min.js"></script>
diff --git a/src/messaging/nmvSwc/index.ts b/src/messaging/nmvSwc/index.ts
index d7bd4d6a767d013e2e357cb98d79202a7ecfed08..8d5d824def87226d1f08265340d7120a22b626dc 100644
--- a/src/messaging/nmvSwc/index.ts
+++ b/src/messaging/nmvSwc/index.ts
@@ -162,6 +162,9 @@ export const processJsonLd = (json: { [key: string]: any }): Observable<IMessagi
* swc seem to scale with voxelSize... strangely enough
* voxelSize nm / voxel -> goal is 1 voxel/um
* 1e3 / voxelSize
+ *
+ * update: nope... it seems ... at least the SWC sent so far
+ *
*/
const scaleUmToVoxelFixed = [
voxelSize[0],
@@ -171,12 +174,13 @@ export const processJsonLd = (json: { [key: string]: any }): Observable<IMessagi
// NG translation works on nm scale
const scaleUmToNm = 1e3
const modA = mat3.fromValues(
- scaleUmToVoxelFixed[0], 0, 0,
- 0, scaleUmToVoxelFixed[1], 0,
- 0, 0, scaleUmToVoxelFixed[2]
+ scaleUmToNm, 0, 0,
+ 0, scaleUmToNm, 0,
+ 0, 0, scaleUmToNm
)
mat3.mul(modA, modA, [...A[0], ...A[1], ...A[2]])
- const modb = vec3.scale(vec3.create(), b, scaleUmToNm)
+ const modb = vec3.mul(vec3.create(), b, [ scaleUmToNm, scaleUmToNm, scaleUmToNm])
+ vec3.scale(vec3.create(), b, scaleUmToNm)
const transform = [
[...modA.slice(0, 3), modb[0]] as TVec4,
[...modA.slice(3, 6), modb[1]] as TVec4,
diff --git a/src/messaging/service.ts b/src/messaging/service.ts
index 365a2d1880bd4513bb088b49ff0b761faa30b36c..054810659af2b05f7a76455ff792eea067426519 100644
--- a/src/messaging/service.ts
+++ b/src/messaging/service.ts
@@ -10,6 +10,9 @@ import { ConfirmDialogComponent } from "src/components/confirmDialog/confirmDial
import { IMessagingActions, IMessagingActionTmpl, WINDOW_MESSAGING_HANDLER_TOKEN, IWindowMessaging } from './types'
import { TYPE as NMV_TYPE, processJsonLd as nmvProcess } from './nmvSwc/index'
import { TYPE as NATIVE_TYPE, processJsonLd as nativeProcess } from './native'
+import { BoothVisitor, JRPCRequest, ListenerChannel } from "src/api/jsonrpc"
+import { ApiService } from "src/api";
+import { ApiBoothEvents } from "src/api/service";
export const IAV_POSTMESSAGE_NAMESPACE = `ebrains:iav:`
@@ -18,12 +21,22 @@ export const MANAGED_METHODS = [
'openminds:nmv:unloadSwc'
]
+class WindowOpenerListener implements ListenerChannel {
+ constructor(
+ public registerLeaveCb: () => void,
+ public notify: (payload: JRPCRequest<unknown, unknown>) => void
+ ){}
+
+}
+
@Injectable({
providedIn: 'root'
})
export class MessagingService {
+ private originListenerMap = new Map<string, {listener: WindowOpenerListener, visitor: BoothVisitor<ApiBoothEvents>}>()
+
private whiteListedOrigins = new Set()
private pendingRequests: Map<string, Promise<boolean>> = new Map()
private windowName: string
@@ -34,6 +47,7 @@ export class MessagingService {
private dialog: MatDialog,
private snackbar: MatSnackBar,
private worker: AtlasWorkerService,
+ private apiService: ApiService,
@Optional() @Inject(WINDOW_MESSAGING_HANDLER_TOKEN) private messagingHandler: IWindowMessaging,
){
@@ -64,7 +78,27 @@ export class MessagingService {
const src = source as Window
const { id } = data
try {
- const result = await this.handleMessage({ data, origin })
+ let result = await this.handleMessage({ data, origin })
+ if (!this.originListenerMap.has(origin)) {
+ const listener = new WindowOpenerListener(() => {
+ this.apiService.broadcastCh.listeners
+ }, val => src.postMessage(val, origin))
+
+ const visitor = this.apiService.booth.handshake()
+ this.originListenerMap.set(origin, {listener, visitor})
+
+ this.apiService.broadcastCh.addListener(listener)
+
+
+ /**
+ * if result was not yet populated, try populating it with
+ * siibra-explorer api
+ */
+ }
+ if (!result) {
+ const { visitor } = this.originListenerMap.get(origin)
+ return await visitor.request(data)
+ }
src.postMessage({
id,
jsonrpc: '2.0',
@@ -94,27 +128,25 @@ export class MessagingService {
public async handleMessage({ data, origin }) {
const { method, param } = data
-
- if (!method) return
- if (method.indexOf(IAV_POSTMESSAGE_NAMESPACE) !== 0) return
- const strippedMethod = method.replace(IAV_POSTMESSAGE_NAMESPACE, '')
-
/**
* if ping method, respond pong method
*/
- if (strippedMethod === 'ping') {
+ if (method === 'ping') {
return 'pong'
}
/**
* otherwise, check permission
*/
-
const allow = await this.checkOrigin({ origin })
if (!allow) throw ({
code: 403,
message: 'User declined'
})
+
+ if (!method) return
+ if (method.indexOf(IAV_POSTMESSAGE_NAMESPACE) !== 0) return
+ const strippedMethod = method.replace(IAV_POSTMESSAGE_NAMESPACE, '')
// TODO
// in future, check if in managed_methods
@@ -212,7 +244,7 @@ export class MessagingService {
return await this.processJsonld(param)
}
- throw ({ code: 404, message: 'Method not found' })
+ return
}
async checkOrigin({ origin }): Promise<boolean> {
diff --git a/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.component.ts b/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.component.ts
index a6e58b8462cb398d87f2f6b26b61607110950f2d..118031cc0806bb692dead3bff0f7811adae32759 100644
--- a/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.component.ts
+++ b/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.component.ts
@@ -4,7 +4,7 @@ import { combineLatest, fromEvent, interval, merge, Observable, of, Subject, Sub
import { userInterface } from "src/state";
import { NehubaViewerUnit } from "../../nehubaViewer/nehubaViewer.component";
import { NEHUBA_INSTANCE_INJTKN, takeOnePipe, getFourPanel, getHorizontalOneThree, getSinglePanel, getPipPanel, getVerticalOneThree } from "../../util";
-import { QUICKTOUR_DESC, ARIA_LABELS, IDS } from 'common/constants'
+import { QUICKTOUR_DESC, QUICKTOUR_DESC_MD, ARIA_LABELS, IDS } from 'common/constants'
import { IQuickTourData } from "src/ui/quickTour/constrants";
import { debounce, debounceTime, distinctUntilChanged, filter, map, mapTo, switchMap, take } from "rxjs/operators";
import {panelOrder} from "src/state/userInterface/selectors";
@@ -28,6 +28,7 @@ export class NehubaLayoutOverlay implements OnDestroy{
public quickTourSliceViewSlide: IQuickTourData = {
order: 1,
description: QUICKTOUR_DESC.SLICE_VIEW,
+ descriptionMd: QUICKTOUR_DESC_MD.SLICE_VIEW
}
public quickTour3dViewSlide: IQuickTourData = {
diff --git a/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.template.html b/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.template.html
index 5ae334a2db080f80a983734c1004c3e3e46e231b..18968039f924b3625f13254ff2b2d6e0bf346f61 100644
--- a/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.template.html
+++ b/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.template.html
@@ -7,6 +7,7 @@
[iav-window-resize-time]="64"
(iav-window-resize-event)="setQuickTourPos()"
quick-tour
+ [quick-tour-description-md]="quickTourSliceViewSlide.descriptionMd"
[quick-tour-description]="quickTourSliceViewSlide.description"
[quick-tour-order]="quickTourSliceViewSlide.order"
[quick-tour-overwrite-arrow]="sliceViewArrow"