Merge pull request #1307 from FZJ-INM1-BDA/staging

v2.10.1
FZJ-INM1-BDA · Apr 19, 2023 · dd1c5ed · dd1c5ed
2 parents 935ee1a + 3944c78
commit dd1c5ed
Show file tree

Hide file tree

Showing 30 changed files with 1,209 additions and 667 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -74,7 +74,7 @@ jobs:
 
     - name: Set output when workflow fails
       if: failure()
-      run: echo '::set-output name=failure-state::true'
+      run: echo "failure-state=true" >> $GITHUB_OUTPUT
       id: failure-state-step
 
     - name: Define screenshot artefact

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
       id: set-version
       run: |
         PACKAGEJSON_VER=v$(cat package.json | jq -r '.version')
-        echo "::set-output name=package-version-from-json::$PACKAGEJSON_VER"
+        echo "package-version-from-json=$PACKAGEJSON_VER" >> $GITHUB_OUTPUT
       
   create-release:
     needs: check-version

diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html
@@ -15,5 +15,5 @@
   }
 </style>
 <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
-<script type="module" src="https://unpkg.com/hbp-connectivity-component@0.6.5/dist/connectivity-component/connectivity-component.js" defer></script>
+<script type="module" src="https://unpkg.com/hbp-connectivity-component@0.6.6/dist/connectivity-component/connectivity-component.js" defer></script>
 <link rel="stylesheet" href="icons/iav-icons.css">
diff --git a/deploy/csp/index.js b/deploy/csp/index.js
@@ -116,7 +116,7 @@ module.exports = {
           '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.6/dist/ng-layer-tune/', // needed for ng layer control
-          'https://unpkg.com/hbp-connectivity-component@0.6.5/', // needed for connectivity component
+          '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,
           ...WHITE_LIST_SRC,

diff --git a/docs/releases/v2.10.1.md b/docs/releases/v2.10.1.md
@@ -0,0 +1,12 @@
+# v2.10.1
+
+## Bugfix
+
+- fsaverage on change variant, showing multiple meshes
+- fsaverage erroneous URL encoding of selected region
+- some annotations no longe rwork properly
+
+## Behind the scenes
+
+- Housekeeping CI/CD
+- Simplify some behind the scenes code
diff --git 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.10.1: 'releases/v2.10.1.md'
     - v2.10.0: 'releases/v2.10.0.md'
     - v2.9.1: 'releases/v2.9.1.md'
     - v2.9.0: 'releases/v2.9.0.md'

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "siibra-explorer",
-  "version": "2.10.0",
+  "version": "2.10.1",
   "description": "siibra-explorer - explore brain atlases. Based on humanbrainproject/nehuba & google/neuroglancer. Built with angular",
   "scripts": {
     "lint": "eslint src --ext .ts",
@@ -11,7 +11,7 @@
     "watch": "ng build --watch --configuration development",
     "test": "ng test",
     "test-ci": "ng test --progress false --watch false --browsers=ChromeHeadless",
-    "sapi-schema": "npx openapi-typescript@6.1.0 https://siibra-api-latest.apps-dev.hbp.eu/v3_0/openapi.json --output ./src/atlasComponents/sapi/schemaV3.ts && eslint ./src/atlasComponents/sapi/schemaV3.ts --no-ignore --fix",
+    "sapi-schema": "npx openapi-typescript@6.1.0 https://siibra-api-stable.apps-dev.hbp.eu/v3_0/openapi.json --output ./src/atlasComponents/sapi/schemaV3.ts && eslint ./src/atlasComponents/sapi/schemaV3.ts --no-ignore --fix",
     "api-schema": "node src/plugin/generateTypes.js",
     "docs:json": "compodoc -p ./tsconfig.json -e json -d .",
     "storybook": "npm run docs:json && start-storybook -p 6006",

diff --git a/src/atlasComponents/sapi/constants.ts b/src/atlasComponents/sapi/constants.ts
@@ -9,6 +9,7 @@ export const IDS = {
     COLIN27: "minds/core/referencespace/v1.0.0/7f39f7be-445b-47c0-9791-e971c0b6d992",
     WAXHOLM: "minds/core/referencespace/v1.0.0/d5717c4a-0fa1-46e6-918c-b8003069ade8",
     MEBRAINS: "minds/core/referencespace/v1.0.0/MEBRAINS",
+    FSAVERAGE: 'minds/core/referencespace/v1.0.0/tmp-fsaverage'
   },
   PARCELLATION: {
     JBA29: "minds/core/parcellationatlas/v1.0.0/94c1125b-b87e-45e4-901c-00daee7f2579-290",

diff --git a/src/atlasComponents/sapi/sapi.service.ts b/src/atlasComponents/sapi/sapi.service.ts
@@ -22,7 +22,7 @@ export const useViewer = {
 } as const
 
 export const SIIBRA_API_VERSION_HEADER_KEY='x-siibra-api-version'
-export const EXPECTED_SIIBRA_API_VERSION = '0.3.0'
+export const EXPECTED_SIIBRA_API_VERSION = '0.3.1'
 
 let BS_ENDPOINT_CACHED_VALUE: Observable<string> = null
 

diff --git a/src/atlasComponents/sapi/schemaV3.ts b/src/atlasComponents/sapi/schemaV3.ts
@@ -489,11 +489,11 @@ export interface components {
       /** @Type */
       "@type": string
       /** Index */
-      index: string[]
+      index: unknown[]
       /** Dtype */
       dtype: string
       /** Columns */
-      columns: string[]
+      columns: unknown[]
       /** Ndim */
       ndim: number
       /** Data */
@@ -510,7 +510,7 @@ export interface components {
       /** Urls */
       urls: (components["schemas"]["EbrainsDsUrl"])[]
       /** Description */
-      description: string
+      description?: string
       /** Contributors */
       contributors: (components["schemas"]["EbrainsDsPerson"])[]
       /** Ebrains Page */
@@ -722,6 +722,8 @@ export interface components {
       page: number
       /** Size */
       size: number
+      /** Pages */
+      pages?: number
     }
     /** Page[FeatureMetaModel] */
     Page_FeatureMetaModel_: {
@@ -733,6 +735,8 @@ export interface components {
       page: number
       /** Size */
       size: number
+      /** Pages */
+      pages?: number
     }
     /** Page[ParcellationEntityVersionModel] */
     Page_ParcellationEntityVersionModel_: {
@@ -744,6 +748,8 @@ export interface components {
       page: number
       /** Size */
       size: number
+      /** Pages */
+      pages?: number
     }
     /** Page[SiibraAtlasModel] */
     Page_SiibraAtlasModel_: {
@@ -755,6 +761,8 @@ export interface components {
       page: number
       /** Size */
       size: number
+      /** Pages */
+      pages?: number
     }
     /** Page[SiibraCorticalProfileModel] */
     Page_SiibraCorticalProfileModel_: {
@@ -766,6 +774,8 @@ export interface components {
       page: number
       /** Size */
       size: number
+      /** Pages */
+      pages?: number
     }
     /** Page[SiibraEbrainsDataFeatureModel] */
     Page_SiibraEbrainsDataFeatureModel_: {
@@ -777,6 +787,8 @@ export interface components {
       page: number
       /** Size */
       size: number
+      /** Pages */
+      pages?: number
     }
     /** Page[SiibraParcellationModel] */
     Page_SiibraParcellationModel_: {
@@ -788,6 +800,8 @@ export interface components {
       page: number
       /** Size */
       size: number
+      /** Pages */
+      pages?: number
     }
     /** Page[SiibraRegionalConnectivityModel] */
     Page_SiibraRegionalConnectivityModel_: {
@@ -799,6 +813,8 @@ export interface components {
       page: number
       /** Size */
       size: number
+      /** Pages */
+      pages?: number
     }
     /** Page[SiibraTabularModel] */
     Page_SiibraTabularModel_: {
@@ -810,6 +826,8 @@ export interface components {
       page: number
       /** Size */
       size: number
+      /** Pages */
+      pages?: number
     }
     /** Page[SiibraVoiModel] */
     Page_SiibraVoiModel_: {
@@ -821,6 +839,8 @@ export interface components {
       page: number
       /** Size */
       size: number
+      /** Pages */
+      pages?: number
     }
     /** Page[Union[SiibraCorticalProfileModel, SiibraReceptorDensityFp, SiibraTabularModel]] */
     Page_Union_SiibraCorticalProfileModel__SiibraReceptorDensityFp__SiibraTabularModel__: {
@@ -832,6 +852,8 @@ export interface components {
       page: number
       /** Size */
       size: number
+      /** Pages */
+      pages?: number
     }
     /** ParcellationEntityVersionModel */
     ParcellationEntityVersionModel: {
@@ -985,7 +1007,8 @@ export interface components {
     SiibraAnchorModel: {
       /** @Type */
       "@type": string
-      location?: components["schemas"]["LocationModel"]
+      /** Location */
+      location?: components["schemas"]["LocationModel"] | components["schemas"]["CoordinatePointModel"]
       /** Regions */
       regions: (components["schemas"]["SiibraRegionAssignmentQual"])[]
     }

diff --git a/src/atlasComponents/sapi/sxplrTypes.ts b/src/atlasComponents/sapi/sxplrTypes.ts
@@ -125,8 +125,8 @@ export type CorticalFeature<T extends CorticalDataType, IndexType extends string
 type TabularDataType = number | string | number[]
 
 export type TabularFeature<T extends TabularDataType> = {
-  index: string[]
-  columns: string[]
+  index: unknown[]
+  columns: unknown[]
   data?: T[][]
 } & Feature