chore: greater diff side drawer (#604)

chore: rearrange signin icons
chore: sort atlas

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

src/res/ext/atlas/atlas_allenMouse.json

 {
   "@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",

src/res/ext/atlas/atlas_multiLevelHuman.json

 {
   "@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",

src/res/ext/atlas/atlas_waxholmRat.json

 {
   "@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",

src/theme.scss

@@ -21,6 +21,7 @@
       background-color: mat-color($background, background)
     }
 
+    &[darker-bg],
     &.darker-bg
     {
       background-color: $background-color;

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>

src/ui/signinBanner/signinBanner.style.css

@@ -17,5 +17,5 @@ take-screenshot
 
 .btnWrapper
 {
-  margin: 0.5rem;
+  margin: 0 0.5rem;
 }

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)
     )