Merge pull request #262 from stuartwoodman/AUS-3926-3929-Fixes

Aus-3926/3929 UI Fixes
AuScope · May 16, 2023 · a1eae35 · a1eae35
2 parents a47fb90 + 0fece68
commit a1eae35
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/app/menupanel/activelayers/activelayerspanel.component.html b/src/app/menupanel/activelayers/activelayerspanel.component.html
@@ -2,7 +2,7 @@
     Select layers below to add to map
 </div>
 <div class="activeLayersBoundary" cdkDropList (cdkDropListDropped)="layerDropped($event)">
-    <li class="activeLayerItem" *ngFor="let layer of getActiveLayers()" cdkDrag cdkDragLockAxis="y" cdkDragBoundary=".activeLayersBoundary">
+    <li class="activeLayerItem" *ngFor="let layer of getActiveLayers()" cdkDrag cdkDragLockAxis="y" cdkDragBoundary=".activeLayersBoundary" [cdkDragDisabled]="getActiveLayers().length <= 1">
         <div *ngIf="getActiveLayers().length > 1" cdkDragHandle>
             <i class="activeLayerGrabber fa fa-arrows-v" title="Drag to reorder"></i>
         </div>

diff --git a/src/app/menupanel/login/login.component.scss b/src/app/menupanel/login/login.component.scss
@@ -11,6 +11,7 @@
   text-align: center;
   color: #fff;
   padding: 3em;
+  z-index: 999999999;
 
   .user-avatar {
       -webkit-border-radius: 50%;

diff --git a/src/app/portal/portal.component.html b/src/app/portal/portal.component.html
@@ -37,7 +37,7 @@ <h5 class="mb-1">
     <!-- END Active Layers -->
 
     <!-- BEGIN Featured Layers -->
-    <input type="checkbox" class="menuBtn" id="featuredLayersBtn"/>
+    <input type="checkbox" class="menuBtn" id="featuredLayersBtn" [(ngModel)]="featuredLayersCheckbox"/>
     <h5 class="mb-1">
         <label id="featuredLayersLink" for="featuredLayersBtn" class="mb-0" title="Select predefined layers">
             <i class="ti-layers"></i>

diff --git a/src/app/portal/portal.component.ts b/src/app/portal/portal.component.ts
@@ -10,10 +10,21 @@ import { AuthService } from 'app/services/auth/auth.service';
 })
 export class PortalComponent {
 
-  featuredLayersCheckbox: boolean;
+  featuredLayersCheckbox: boolean = true;
 
   constructor(private authService: AuthService) {}
 
+  /**
+   * Featured layers would not display after logging in due to a strange UI bug, so by binding
+   * the panel checkbox to a variable we can set it immediately after display to ensure the
+   * panel is always expanded after a page refresh
+   */
+  ngAfterViewInit() {
+    setTimeout(() => {
+      this.featuredLayersCheckbox = true;
+    }, 10);
+  }
+
   /**
    * Check is a user is logged in.
    *