diff --git a/package-lock.json b/package-lock.json
index ddebd64c07e83e9ea2fcfe80eb0efa2b9cdc910a..f6e7585aebf12c0f8f457bf3ae570fa65b1098dd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2876,6 +2876,16 @@
"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
"dev": true
},
+ "bindings": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+ "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "file-uri-to-path": "1.0.0"
+ }
+ },
"bl": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -5200,6 +5210,13 @@
"schema-utils": "^3.0.0"
}
},
+ "file-uri-to-path": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+ "dev": true,
+ "optional": true
+ },
"fill-range": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -5648,9 +5665,9 @@
}
},
"hbp-connectivity-component": {
- "version": "0.4.10",
- "resolved": "https://registry.npmjs.org/hbp-connectivity-component/-/hbp-connectivity-component-0.4.10.tgz",
- "integrity": "sha512-bOs4cuFFE0L0Fr8KTxR1sIPxDii0Mc4XofT8O8Jjs7wgCVPPt50deI/ZsbZGPKBjG71nFf/4zpa68xXqDX8BaA==",
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/hbp-connectivity-component/-/hbp-connectivity-component-0.5.2.tgz",
+ "integrity": "sha512-lGFkfuEWbuor9sqBnJxBcArdQ04WeHPvNAuHdaJL8bHMWxbAlnEOrPGn4AkdQO587rWD78cVw3LwEFSBm3O1Bg==",
"requires": {
"@stencil/core": "^1.16.5",
"@types/node": "^14.0.24",
@@ -5659,9 +5676,9 @@
},
"dependencies": {
"@types/node": {
- "version": "14.17.19",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.19.tgz",
- "integrity": "sha512-jjYI6NkyfXykucU6ELEoT64QyKOdvaA6enOqKtP4xUsGY0X0ZUZz29fUmrTRo+7v7c6TgDu82q3GHHaCEkqZwA=="
+ "version": "14.17.21",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.21.tgz",
+ "integrity": "sha512-zv8ukKci1mrILYiQOwGSV4FpkZhyxQtuFWGya2GujWg+zVAeRQ4qbaMmWp9vb9889CFA8JECH7lkwCL6Ygg8kA=="
}
}
},
@@ -7585,6 +7602,13 @@
"integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
"dev": true
},
+ "nan": {
+ "version": "2.15.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz",
+ "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==",
+ "dev": true,
+ "optional": true
+ },
"nanocolors": {
"version": "0.2.11",
"resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.11.tgz",
@@ -12000,7 +12024,11 @@
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
"dev": true,
- "optional": true
+ "optional": true,
+ "requires": {
+ "bindings": "^1.5.0",
+ "nan": "^2.12.1"
+ }
},
"glob-parent": {
"version": "3.1.0",
diff --git a/package.json b/package.json
index e8d2538141f347d298edf7083b66cd29ce80860e..d681ba9999ba7d62154b79b4e0fc11c82c2ac765 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
"acorn": "^8.4.1",
"export-nehuba": "0.0.12",
"file-loader": "^6.2.0",
- "hbp-connectivity-component": "^0.4.10",
+ "hbp-connectivity-component": "^0.5.2",
"jszip": "^3.6.0",
"postcss": "^8.3.6",
"raw-loader": "^4.0.2",
diff --git a/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.component.ts b/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.component.ts
index 19aff2563fb150e456ecf41ff7828d7de17e9795..638863a0893fc8a064fc1e7482b24b56bf956a39 100644
--- a/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.component.ts
+++ b/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.component.ts
@@ -133,6 +133,7 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe
public regionHemisphere: string = null
public datasetList: any[] = []
public selectedDataset: any
+ public selectedDatasetName: any
public selectedDatasetDescription: string = ''
public selectedDatasetKgId: string = ''
public selectedDatasetKgSchema: string = ''
@@ -175,6 +176,7 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe
this.httpClient.get<[]>(this.connectivityUrl).subscribe(res => {
this.datasetList = res
this.selectedDataset = this.datasetList[0]?.['@id']
+ this.selectedDatasetName = this.datasetList[0]?.['src_name']
this.selectedDatasetDescription = this.datasetList[0]?.['src_info']
// this.selectedDatasetKgId = this.datasetList[0]?.kgId || null
// this.selectedDatasetKgSchema = this.datasetList[0]?.kgSchema || null
@@ -306,7 +308,7 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe
}
private setConnectivityUrl() {
- this.connectivityUrl = `${this.siibraApiUrl}/atlases/${encodeURIComponent(this.atlasId)}/parcellations/${encodeURIComponent(this.parcellationId)}/regions/${encodeURIComponent(this.regionId || this.regionName)}/features/ConnectivityProfile`
+ this.connectivityUrl = `${this.siibraApiUrl}/atlases/${encodeURIComponent(this.atlasId)}/parcellations/${encodeURIComponent(this.parcellationId)}/regions/${encodeURIComponent(this.regionName)}/features/ConnectivityProfile`
}
private setProfileLoadUrl() {
@@ -334,6 +336,7 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe
if (event) {
this.selectedDataset = event.value
const foundDataset = this.datasetList.find(d => d['@id'] === this.selectedDataset)
+ this.selectedDatasetName = foundDataset?.['src_name']
this.selectedDatasetDescription = foundDataset?.['src_info']
// this.selectedDatasetKgId = foundDataset?.kgId || null
// this.selectedDatasetKgSchema = foundDataset?.kgSchema || null
@@ -341,7 +344,7 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe
if (this.datasetList.length && this.selectedDataset) {
this.setProfileLoadUrl()
- this.fullConnectivityLoadUrl = `${this.siibraApiUrl}/atlases/${encodeURIComponent(this.atlasId)}/parcellations/${encodeURIComponent(this.parcellationId)}/features/ConnectivityMatrix/${encodeURIComponent(this.selectedDataset)}`
+ this.fullConnectivityLoadUrl = `${this.siibraApiUrl}/atlases/${encodeURIComponent(this.atlasId)}/parcellations/${encodeURIComponent(this.parcellationId)}/features/ConnectivityMatrix/${encodeURIComponent(this.selectedDatasetName)}`
}
}
diff --git a/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.template.html b/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.template.html
index 696e579280a4b119a33ae589417bc282246cd634..9dfdc054e09c6eba8ad1318a37cca2db792a8ef2 100644
--- a/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.template.html
+++ b/src/atlasComponents/connectivity/connectivityBrowser/connectivityBrowser.template.html
@@ -39,7 +39,7 @@
<button class="flex-grow-0 flex-shrink-0"
mat-icon-button
iav-dataset-show-dataset-dialog
- [iav-dataset-show-dataset-dialog-name]="selectedDataset"
+ [iav-dataset-show-dataset-dialog-name]="selectedDatasetName"
[iav-dataset-show-dataset-dialog-description]="selectedDatasetDescription"
[iav-dataset-show-dataset-dialog-kgid]="selectedDatasetKgId? selectedDatasetKgId : null"
[iav-dataset-show-dataset-dialog-kgschema]="selectedDatasetKgSchema? selectedDatasetKgSchema : null"
@@ -92,6 +92,6 @@
[loadurl]="fullConnectivityLoadUrl"
[name]="selectedDataset"
[description]="selectedDatasetDescription"
- onlyExport="true">
+ only-export="true">
</full-connectivity-grid>
</div>
diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts
index f2c3057d8c6514d6b5b3a6d5c51bb1d27a683aca..52bdf0c70442a366f643e161bca3502346b756c4 100644
--- a/src/environments/environment.common.ts
+++ b/src/environments/environment.common.ts
@@ -4,7 +4,7 @@ export const environment = {
PRODUCTION: true,
BACKEND_URL: null,
DATASET_PREVIEW_URL: 'https://hbp-kg-dataset-previewer.apps.hbp.eu/v2',
- BS_REST_URL: 'https://siibra-api-edge.apps-dev.hbp.eu/v1_0',
+ BS_REST_URL: 'https://siibra-api-latest.apps-dev.hbp.eu/v1_0',
SPATIAL_TRANSFORM_BACKEND: 'https://hbp-spatial-backend.apps.hbp.eu',
MATOMO_URL: null,
MATOMO_ID: null,