Fixed loading of url with parameters at startup

jirkapok · Mar 11, 2024 · 2c311fc · 2c311fc
1 parent 361e52f
commit 2c311fc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/doc/roadmap.md b/doc/roadmap.md
@@ -7,7 +7,6 @@ Following list of features and improvements ordered by priority is under develop
 * Fix the duplicate load needed when accessing the page as pwa - Clear browser cache
 * Fix wrong time format message in console created by plotly - requires more customization and additional reference to d3, wan't fix
 * Main menu overlaps the tabs, when text is wrapped on two rows (and some other responsiveness glitches)
-* Shared link to dashboard does not load the profile
 
 ## Improvements / Features
 

diff --git a/projects/planner/src/app/app-routing.module.ts b/projects/planner/src/app/app-routing.module.ts
@@ -1,4 +1,11 @@
-import { CanActivateFn, Router, RouterModule, Routes, UrlTree } from '@angular/router';
+import {
+    ActivatedRouteSnapshot,
+    CanActivateFn,
+    Router,
+    RouterModule,
+    Routes,
+    UrlTree
+} from '@angular/router';
 import { Location } from '@angular/common';
 import { AppSettingsComponent } from './app-settings/app-settings.component';
 import { DashboardComponent } from './dashboard/dashboard.component';
@@ -15,10 +22,12 @@ import { DiffComponent } from './diff/diff.component';
 import { RedundanciesComponent } from './redundancies/redundancies.component';
 import { GasBlenderComponent } from './gas-blender/gas-blender.component';
 
-const canActivateDashboard: CanActivateFn = (): boolean | UrlTree => {
+const canActivateDashboard: CanActivateFn = (route: ActivatedRouteSnapshot): boolean | UrlTree => {
     const router = inject(Router);
     const viewStates = inject(ViewStates);
-    if (viewStates.redirectToView) {
+
+    // the only view with params is dashboard with only one dive
+    if (route.queryParamMap.keys.length === 0 && viewStates.redirectToView) {
         const target = `/${viewStates.lastView}`;
         const location = inject(Location);
         location.go(target);

diff --git a/projects/planner/src/app/shared/startUp.ts b/projects/planner/src/app/shared/startUp.ts
@@ -33,9 +33,11 @@ export class DashboardStartUp {
             this.urlSerialization.fromUrl(query);
             // cant do in constructor, since the state may be changed
             this.viewStore.saveMainView();
-            // in case it fails we need to reset the parameters
-            this.updateQueryParams();
         }
+
+        // in case it fails we need to reset the parameters
+        // or in case of navigation to dashboard with only one dive
+        this.updateQueryParams();
     }
 
     public stopDisclaimer(): void {