diff --git a/src/atlasViewer/atlasViewer.template.html b/src/atlasViewer/atlasViewer.template.html
index 9343eb3c2ae1f486c48c26deecff3acae4f6d5aa..0705620836d256c51f954ce0a18720db2bfd9aeb 100644
--- a/src/atlasViewer/atlasViewer.template.html
+++ b/src/atlasViewer/atlasViewer.template.html
@@ -59,7 +59,7 @@
<div ui-nehuba-container-overlay-top-right
class="d-inline-flex flex-row justify-content-end align-items-start z-index-6 position-absolute pe-none w-100 h-100">
<!-- atlas selector -->
- <atlas-dropdown-selector class="pe-all mt-4">
+ <atlas-dropdown-selector class="pe-all mt-2">
</atlas-dropdown-selector>
<signin-banner
diff --git a/src/res/ext/atlas/atlas_allenMouse.json b/src/res/ext/atlas/atlas_allenMouse.json
index f277d9f3bcf6be307511e11ee5f0b1e0b17326db..07f1b18ef53efb92db32cef4349f7e935af10b5c 100644
--- a/src/res/ext/atlas/atlas_allenMouse.json
+++ b/src/res/ext/atlas/atlas_allenMouse.json
@@ -1,6 +1,7 @@
{
"@id": "juelich/iav/atlas/v1.0.0/2",
"name": "Allen Mouse Common Coordinate Framework v3",
+ "order": 3,
"templateSpaces": [{
"@id": "minds/core/referencespace/v1.0.0/265d32a0-3d84-40a5-926f-bf89f68212b9",
"name": "Allen Mouse Common Coordinate Framework v3",
diff --git a/src/res/ext/atlas/atlas_multiLevelHuman.json b/src/res/ext/atlas/atlas_multiLevelHuman.json
index 17ea2fc6945741138bca12447203f6581ccbefaf..0e5c934e0913c3c6e0abdbdfc8cd4251ce3b098e 100644
--- a/src/res/ext/atlas/atlas_multiLevelHuman.json
+++ b/src/res/ext/atlas/atlas_multiLevelHuman.json
@@ -1,6 +1,7 @@
{
"@id": "juelich/iav/atlas/v1.0.0/1",
"name": "Multilevel Human Atlas",
+ "order": 1,
"templateSpaces": [
{
"@id": "minds/core/referencespace/v1.0.0/a1655b99-82f1-420f-a3c2-fe80fd4c8588",
diff --git a/src/res/ext/atlas/atlas_waxholmRat.json b/src/res/ext/atlas/atlas_waxholmRat.json
index f4b9ecfef48ae3cbff429fb316f6cb767b421f0b..16a1819c18f42e4629be95fca21182c3449cbcf1 100644
--- a/src/res/ext/atlas/atlas_waxholmRat.json
+++ b/src/res/ext/atlas/atlas_waxholmRat.json
@@ -1,6 +1,7 @@
{
"@id": "minds/core/parcellationatlas/v1.0.0/522b368e-49a3-49fa-88d3-0870a307974a",
"name": "Waxholm Space atlas of the Sprague Dawley rat brain",
+ "order": 2,
"templateSpaces": [{
"@id": "minds/core/referencespace/v1.0.0/d5717c4a-0fa1-46e6-918c-b8003069ade8",
"name": "Waxholm Space rat brain MRI/DTI",
diff --git a/src/theme.scss b/src/theme.scss
index 93e185931cb27302296b57a712c8b8c0a9c659a1..603259482eca15743853afed3fe673362d1219bc 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -21,6 +21,7 @@
background-color: mat-color($background, background)
}
+ &[darker-bg],
&.darker-bg
{
background-color: $background-color;
diff --git a/src/ui/nehubaContainer/nehubaContainer.template.html b/src/ui/nehubaContainer/nehubaContainer.template.html
index c8ca5072eebdb4396ad047751f1b8d2b5662e6ca..a4000a58506c9503dd81744ad50ca641df922ce4 100644
--- a/src/ui/nehubaContainer/nehubaContainer.template.html
+++ b/src/ui/nehubaContainer/nehubaContainer.template.html
@@ -112,7 +112,7 @@
[hasBackdrop]="false">
<!-- sidenav-content -->
- <mat-drawer class="visible col-10 col-sm-10 col-md-5 col-lg-4 col-xl-3 col-xxl-2 d-flex flex-column pe-all"
+ <mat-drawer class="darker-bg iv-custom-comp visible col-10 col-sm-10 col-md-5 col-lg-4 col-xl-3 col-xxl-2 d-flex flex-column pe-all"
mode="push"
[autoFocus]="false"
#matDrawerMinor="matDrawer"
@@ -153,11 +153,15 @@
<mat-chip-list class="mb-2">
<!-- additional layer -->
- <ng-container *ngTemplateOutlet="currParcellationTmpl; context: { addParc: (selectedAdditionalLayers$ | async), parc: selectedParcellation }">
+ <ng-container *ngIf="!alSelector.selectorExpanded">
+ <ng-container *ngTemplateOutlet="currParcellationTmpl; context: { addParc: (selectedAdditionalLayers$ | async), parc: selectedParcellation }">
+ </ng-container>
</ng-container>
<!-- any selected region(s) -->
- <ng-container *ngTemplateOutlet="selectedRegionTmpl">
+ <ng-container *ngIf="!sideNavMasterSwitch.switchState || !sideNavSwitch.switchState">
+ <ng-container *ngTemplateOutlet="selectedRegionTmpl">
+ </ng-container>
</ng-container>
</mat-chip-list>
@@ -379,8 +383,11 @@
</mat-card>
- <mat-card *ngIf="selectedParcellation && selectedParcellation.hasAdditionalViewMode
- && selectedParcellation.hasAdditionalViewMode.includes('connectivity') && selectedRegions?.length" class="mt-2 side-nav-cover d-flex flex-column">
+ <mat-card *ngIf="selectedParcellation
+ && selectedParcellation.hasAdditionalViewMode
+ && selectedParcellation.hasAdditionalViewMode.includes('connectivity')
+ && selectedRegions?.length"
+ class="mt-3 side-nav-cover d-flex flex-column">
<mat-card-subtitle class="flex-grow-0 flex-shrink-0">
Connectivity
</mat-card-subtitle>
diff --git a/src/ui/signinBanner/signinBanner.style.css b/src/ui/signinBanner/signinBanner.style.css
index 3ca21c78e3bec7ee9155d48c4468c2c51cf13bac..f85f4c7dca1a9a02e50642a379a5b84c1e00a3d8 100644
--- a/src/ui/signinBanner/signinBanner.style.css
+++ b/src/ui/signinBanner/signinBanner.style.css
@@ -17,5 +17,5 @@ take-screenshot
.btnWrapper
{
- margin: 0.5rem;
+ margin: 0 0.5rem;
}
diff --git a/src/util/pureConstant.service.ts b/src/util/pureConstant.service.ts
index 25668f675b7822edc9ea061ee3ed1b9e9d29b3e5..5cdd0b0cffa480e53e6cd811b9a6601493c8e6a1 100644
--- a/src/util/pureConstant.service.ts
+++ b/src/util/pureConstant.service.ts
@@ -2,7 +2,7 @@ import { Injectable, OnDestroy } from "@angular/core";
import { Store, createSelector, select } from "@ngrx/store";
import { Observable, merge, Subscription, of } from "rxjs";
import { VIEWER_CONFIG_FEATURE_KEY, IViewerConfigState } from "src/services/state/viewerConfig.store.helper";
-import { shareReplay, tap, switchMap, scan, catchError, filter } from "rxjs/operators";
+import { shareReplay, tap, scan, catchError, filter, mergeMap, switchMapTo, switchMap } from "rxjs/operators";
import { HttpClient } from "@angular/common/http";
import { BACKENDURL } from './constants'
import { viewerStateSetFetchedAtlases } from "src/services/state/viewerState.store.helper";
@@ -48,7 +48,7 @@ export class PureContantService implements OnDestroy{
: `${BACKENDURL.replace(/\/$/, '')}/${url}`,
{ responseType: 'json' }))
)),
- scan((acc, curr) => acc.concat(curr), []),
+ scan((acc, curr) => acc.concat(curr).sort((a, b) => (a.order || 1000) - (b.order || 1001)), []),
shareReplay(1)
)