@veloceapps/sdk 8.0.0-85 → 8.0.0-87

package/fesm2020/veloceapps-sdk.mjs

@@ -1724,24 +1724,25 @@ class RootGuard {
         this.router = router;
         this.routerService = routerService;
         this.initialized = false;
-        this.navToRestore = null;
     }
     canActivate(route) {
         // We always need to initialize root component first, and only then start checking guards/resolvers
         if (!this.initialized) {
             this.initialized = true;
-            this.navToRestore = this.router.getCurrentNavigation();
+            const navToRestore = this.router.getCurrentNavigation();
             const rootUrl = this.routerService.getFlowRootPath(route);
-            this.router.navigate([rootUrl], {
-                replaceUrl: !this.navToRestore?.previousNavigation,
-                queryParams: route.queryParams,
-            });
-        }
-        else if (this.navToRestore) {
-            const nav = this.navToRestore;
-            setTimeout(() => {
-                this.router.navigateByUrl(nav.extractedUrl, nav.extras);
-                this.navToRestore = null;
+            this.router
+                .navigate([rootUrl], {
+                replaceUrl: !navToRestore?.previousNavigation,
+                skipLocationChange: true,
+            })
+                .then(success => {
+                if (!success || !navToRestore) {
+                    return;
+                }
+                setTimeout(() => {
+                    this.router.navigateByUrl(navToRestore.extractedUrl, navToRestore.extras);
+                });
             });
         }
         return true;
@@ -2802,71 +2803,78 @@ const rootRoute = {
     id: VELOCE_FLOW_ROOT_ROUTE,
     path: '',
     component: FlowComponent,
-    canActivate: [initFlow],
-    runGuardsAndResolvers: 'always',
+    canActivate: [RootGuard],
+    canDeactivate: [RootGuard],
     children: [
         {
-            path: 'flows',
-            runGuardsAndResolvers: 'paramsOrQueryParamsChange',
-            resolve: { flow: FlowResolver },
-            canActivate: [ContextGuard],
-            children: [],
-        },
-        {
-            path: 'product',
-            component: ProductComponent,
-            runGuardsAndResolvers: 'paramsOrQueryParamsChange',
-            resolve: { quote: QuoteResolver },
-            canActivate: [ContextGuard],
-            canDeactivate: [ProductUnloadGuard],
-            data: { showHeader: true },
-        },
-        {
-            path: 'cart',
-            component: ShoppingCartComponent,
-            runGuardsAndResolvers: 'paramsOrQueryParamsChange',
-            resolve: { quote: QuoteResolver },
-            canActivate: [ContextGuard],
-            data: { showHeader: true },
-        },
-        {
-            path: 'catalog',
-            component: CatalogComponent,
-            runGuardsAndResolvers: 'paramsOrQueryParamsChange',
-            resolve: { quote: QuoteResolver },
-            canActivate: [ContextGuard],
-            data: { showHeader: true },
-        },
-        {
-            path: 'assets',
-            component: AssetsComponent,
-            runGuardsAndResolvers: 'paramsOrQueryParamsChange',
-            resolve: { quote: QuoteResolver },
-            canActivate: [ContextGuard],
-            data: { showHeader: true },
-        },
-        {
-            path: 'empty',
-            component: EmptyAccountComponent,
-            runGuardsAndResolvers: 'paramsOrQueryParamsChange',
-            resolve: { quote: QuoteResolver },
-            canActivate: [ContextGuard],
-            data: { showHeader: true },
-        },
-        {
-            path: 'remote',
-            component: RemoteComponent,
-            runGuardsAndResolvers: 'paramsOrQueryParamsChange',
-            resolve: { quote: QuoteResolver },
-            canActivate: [ContextGuard],
-        },
-        {
-            path: 'debug',
-            loadChildren: () => DebugModule,
-        },
-        {
-            path: '404',
-            loadChildren: () => RecordNotFoundModule,
+            path: '',
+            canActivate: [initFlow],
+            runGuardsAndResolvers: 'always',
+            children: [
+                {
+                    path: 'flows',
+                    runGuardsAndResolvers: 'paramsOrQueryParamsChange',
+                    resolve: { flow: FlowResolver },
+                    canActivate: [ContextGuard],
+                    children: [],
+                },
+                {
+                    path: 'product',
+                    component: ProductComponent,
+                    runGuardsAndResolvers: 'paramsOrQueryParamsChange',
+                    resolve: { quote: QuoteResolver },
+                    canActivate: [ContextGuard],
+                    canDeactivate: [ProductUnloadGuard],
+                    data: { showHeader: true },
+                },
+                {
+                    path: 'cart',
+                    component: ShoppingCartComponent,
+                    runGuardsAndResolvers: 'paramsOrQueryParamsChange',
+                    resolve: { quote: QuoteResolver },
+                    canActivate: [ContextGuard],
+                    data: { showHeader: true },
+                },
+                {
+                    path: 'catalog',
+                    component: CatalogComponent,
+                    runGuardsAndResolvers: 'paramsOrQueryParamsChange',
+                    resolve: { quote: QuoteResolver },
+                    canActivate: [ContextGuard],
+                    data: { showHeader: true },
+                },
+                {
+                    path: 'assets',
+                    component: AssetsComponent,
+                    runGuardsAndResolvers: 'paramsOrQueryParamsChange',
+                    resolve: { quote: QuoteResolver },
+                    canActivate: [ContextGuard],
+                    data: { showHeader: true },
+                },
+                {
+                    path: 'empty',
+                    component: EmptyAccountComponent,
+                    runGuardsAndResolvers: 'paramsOrQueryParamsChange',
+                    resolve: { quote: QuoteResolver },
+                    canActivate: [ContextGuard],
+                    data: { showHeader: true },
+                },
+                {
+                    path: 'remote',
+                    component: RemoteComponent,
+                    runGuardsAndResolvers: 'paramsOrQueryParamsChange',
+                    resolve: { quote: QuoteResolver },
+                    canActivate: [ContextGuard],
+                },
+                {
+                    path: 'debug',
+                    loadChildren: () => DebugModule,
+                },
+                {
+                    path: '404',
+                    loadChildren: () => RecordNotFoundModule,
+                },
+            ],
         },
     ],
 };