Merge pull request #457 from PermanentOrg/profile-dialog-fixes

Profile settings dialog fixes

src/app/core/components/main/main.component.scss

@@ -15,6 +15,10 @@
   }
 }
 
+pr-folder-picker {
+  z-index: 1010;
+}
+
 @include desktop {
   :host {
     display: flex;

src/app/route-history/route-history.service.spec.ts

@@ -65,4 +65,13 @@ describe('RouteHistoryService', () => {
     await router.navigate(['/profile']);
     expectRoutesToBeUndefined();
   });
+
+  it('should not record history on popstate', async () => {
+    await router.navigate(['/home']);
+    await router.navigate(['/profile']);
+    (service as any).popstate = true;
+    await router.navigate(['/home']);
+
+    expect(service.previousRoute).toBeUndefined();
+  });
 });

src/app/route-history/route-history.service.ts

@@ -1,6 +1,6 @@
 /* @format */
 import { Injectable, OnDestroy } from '@angular/core';
-import { Event, NavigationEnd, Router } from '@angular/router';
+import { Event, NavigationEnd, NavigationStart, Router } from '@angular/router';
 import { Subscription } from 'rxjs';
 
 @Injectable({
@@ -11,12 +11,19 @@ export class RouteHistoryService implements OnDestroy {
   public previousRoute: string;
 
   private subscription: Subscription;
+  private popstate: boolean = false;
 
   constructor(router: Router) {
     this.subscription = router.events.subscribe((event: Event) => {
+      if (event instanceof NavigationStart) {
+        if (event.navigationTrigger === 'popstate') {
+          this.popstate = true;
+        }
+      }
       if (event instanceof NavigationEnd) {
-        this.previousRoute = this.currentRoute;
+        this.previousRoute = this.popstate ? undefined : this.currentRoute;
         this.currentRoute = event.url;
+        this.popstate = false;
       }
     });
   }

src/app/shared/components/routed-dialog-wrapper/routed-dialog-wrapper.component.ts

@@ -63,10 +63,10 @@ export class RoutedDialogWrapperComponent
   }
 
   ngOnDestroy(): void {
+    this.closedByNavigate = true;
     if (this.dialogRef) {
       this.dialogRef.close();
     }
-    this.closedByNavigate = true;
     unsubscribeAll(this.subscriptions);
   }