Merge pull request #922 from HumanBrainProject/bugfix_swcE2e

bugfixes (swc data src & e2e tests)

e2e/src/advanced/urlParsing.prod.e2e-spec.js

@@ -86,7 +86,7 @@ describe('> url parsing', () => {
   })
 
   it('> if niftiLayers are defined, parcellation layer should be hidden', async () => {
-    const url = `/?parcellationSelected=JuBrain+Cytoarchitectonic+Atlas&templateSelected=MNI+Colin+27&navigation=0_0_0_1__-0.2753947079181671_0.6631333827972412_-0.6360703706741333_0.2825356423854828__3000000__-17800000_-6700000_-7500000__200000&regionsSelected=142&niftiLayers=https%3A%2F%2Fneuroglancer.humanbrainproject.org%2Fprecomputed%2FJuBrain%2Fv2.2c%2FPMaps%2FBforebrain_4.nii`
+    const url = `/?parcellationSelected=JuBrain+Cytoarchitectonic+Atlas&templateSelected=MNI+Colin+27&cNavigation=0.0.0.-W000.._NjRq.2-Klk_._-Hmu.2_BdKx..DMVW..1vjMG.4eIG8~.hqT5~..10vB&regionsSelected=142&niftiLayers=https%3A%2F%2Fneuroglancer.humanbrainproject.org%2Fprecomputed%2FJuBrain%2Fv2.2c%2FPMaps%2FBforebrain_4.nii`
     await iavPage.goto(url)
     await iavPage.clearAlerts()
 

e2e/src/selecting/template.prod.e2e-spec.js

@@ -3,7 +3,8 @@ const { AtlasPage } = require("../util")
 
 const atlasName = 'Multilevel Human Atlas'
 const tNameIcbm152 = 'ICBM 152 2009c Nonlinear Asymmetric'
-const tNameColin = 'MNI Colin 27'
+// colin has temporarily been disabled
+// const tNameColin = 'MNI Colin 27'
 const tNameBB = 'Big Brain (Histology)'
 
 describe('templates > ', () => {
@@ -68,28 +69,28 @@ describe('templates > ', () => {
     it('> activeFlag works', async () => {
       const isActive = await iavPage.atlasTileIsActive(tNameIcbm152)
       expect(isActive.toString()).toEqual('true')
-      const isNotActive = await iavPage.atlasTileIsActive(tNameColin)
+      const isNotActive = await iavPage.atlasTileIsActive(tNameBB)
       expect(isNotActive.toString()).toEqual('false')
 
     })
     it('> works in regular navigation', async () => {
 
-      await iavPage.setAtlasSpecifications(atlasName, [ tNameColin ])
+      await iavPage.setAtlasSpecifications(atlasName, [ tNameIcbm152 ])
       await iavPage.wait(500)
       await iavPage.waitUntilAllChunksLoaded()
       await iavPage.wait(500)
       
-      const isActive = await iavPage.atlasTileIsActive(tNameColin)
+      const isActive = await iavPage.atlasTileIsActive(tNameIcbm152)
       expect(isActive.toString()).toEqual('true')
 
-      const isNotActive = await iavPage.atlasTileIsActive(tNameIcbm152)
+      const isNotActive = await iavPage.atlasTileIsActive(tNameBB)
       expect(isNotActive.toString()).toEqual('false')
 
     })
 
     it('> works in history navigation', async () => {
 
-      await iavPage.setAtlasSpecifications(atlasName, [ tNameColin ])
+      await iavPage.setAtlasSpecifications(atlasName, [ tNameBB ])
       await iavPage.wait(500)
       await iavPage.waitUntilAllChunksLoaded()
       
@@ -99,7 +100,7 @@ describe('templates > ', () => {
 
       const isActive = await iavPage.atlasTileIsActive(tNameIcbm152)
       expect(isActive.toString()).toEqual('true')
-      const isNotActive = await iavPage.atlasTileIsActive(tNameColin)
+      const isNotActive = await iavPage.atlasTileIsActive(tNameBB)
       expect(isNotActive.toString()).toEqual('false')
     })
   })

package.json

@@ -80,7 +80,7 @@
     "@ngrx/effects": "^9.1.1",
     "@ngrx/store": "^9.1.1",
     "@types/node": "12.12.39",
-    "export-nehuba": "0.0.8",
+    "export-nehuba": "0.0.9",
     "hbp-connectivity-component": "^0.3.18",
     "zone.js": "^0.10.2"
   }

src/messaging/nmvSwc/index.ts

@@ -3,9 +3,9 @@ import { getUuid } from "src/util/fn"
 import { IMessagingActions, IMessagingActionTmpl, TVec4, TMat4 } from "../types"
 import { INmvTransform } from "./type"
 
-export const TYPE = 'bas.datasource'
+export const TYPE = 'bas:datasource'
 
-const waitFor = (condition: (...arg: any[]) => boolean) => new Promise((rs, rj) => {
+const waitFor = (condition: (...arg: any[]) => boolean) => new Promise<void>((rs, rj) => {
   const intervalRef = setInterval(() => {
     if (condition()) {
       clearInterval(intervalRef)

src/messaging/nmvSwc/type.ts

 import { TMat3, TVec3 } from "../types";
 
 export interface INmvTransform {
-  ['@type']: 'bas.AffineTransformation'
+  ['@type']: 'bas:AffineTransformation'
   fromSpace: string
   toSpace: string
   params: {

src/messaging/service.ts

@@ -125,6 +125,9 @@ export class MessagingService {
   processJsonld(jsonLd: any){
     const { ['@type']: type } = jsonLd
     const fn = this.typeRegister.get(type)
+    if (!fn) {
+      return Promise.reject(`${type} does not have a handler registered.`)
+    }
     let returnValue: any = {}
     return new Promise((rs, rj) => {