Merge branch 'develop' into feature/5202-Praemie

apps/isa-app/src/app/app-routing.module.ts

@@ -35,6 +35,7 @@ import {
   tabResolverFn,
   TabService,
   TabNavigationService,
+  processResolverFn,
 } from '@isa/core/tabs';
 import { provideScrollPositionRestoration } from '@isa/utils/scroll-position';
 
@@ -187,7 +188,7 @@ const routes: Routes = [
   {
     path: ':tabId',
     component: MainComponent,
-    resolve: { process: tabResolverFn, tab: tabResolverFn },
+    resolve: { process: processResolverFn, tab: tabResolverFn },
     canActivate: [IsAuthenticatedGuard],
     children: [
       {

apps/isa-app/src/shared/shell/process-bar/process-bar.component.ts

@@ -156,26 +156,7 @@ export class ShellProcessBarComponent implements OnInit {
 
       processes = await this.processes$.pipe(delay(1), first()).toPromise();
 
-      if (processes.length === 0) {
+      this._router.navigate(['/kunde', 'dashboard']);
-        this._router.navigate(['/kunde', 'dashboard']);
-      } else {
-        const lastest = processes.reduce(
-          (prev, current) =>
-            prev.activated > current.activated ? prev : current,
-          processes[0],
-        );
-        const crumb = await this._breadcrumb
-          .getLastActivatedBreadcrumbByKey$(lastest.id)
-          .pipe(first())
-          .toPromise();
-        if (crumb) {
-          this._router.navigate(coerceArray(crumb.path), {
-            queryParams: crumb.params,
-          });
-        } else {
-          this._router.navigate(['/kunde', lastest.id, 'product']);
-        }
-      }
     }
   }
 

apps/isa-app/src/shared/shell/side-menu/side-menu.component.html

@@ -111,7 +111,7 @@
       *ifRole="'Store'"
       class="side-menu-group-item"
       (click)="closeSideMenu(); focusSearchBox()"
-      [routerLink]="['/', tabService.activatedTab()?.id || nextId(), 'return']"
+      [routerLink]="['/', tabId(), 'return']"
       (isActiveChange)="focusSearchBox()"
     >
       <span class="side-menu-group-item-icon w-[2.375rem] h-12">
@@ -303,7 +303,7 @@
         (click)="closeSideMenu(); focusSearchBox()"
         [routerLink]="[
           '/',
-          tabService.activatedTab()?.id || nextId(),
+          tabId(),
           'remission',
         ]"
         (isActiveChange)="focusSearchBox(); remissionExpanded.set($event)"

libs/core/tabs/src/lib/tab.resolver-fn.ts

@@ -26,3 +26,12 @@ export const tabResolverFn: ResolveFn<Tab> = (route) => {
 
   return tab;
 };
+
+/// @deprecated use tabResolverFn instead
+export const processResolverFn: ResolveFn<Tab> = async (route) => {
+  const tabService = inject(TabService);
+  await new Promise((resolve) => setTimeout(resolve, 0));
+  const id = parseInt(route.params['tabId']);
+
+  return tabService.entityMap()[id];
+};