Merged PR 1215: #3062 #3051 Remission Breadcrumbs contain the correct queryParams, Remission Process Remembers Filters if Remission is started

#3062 #3051 Remission Breadcrumbs contain the correct queryParams, Remission Process Remembers Filters if Remission is started. Always load available Remission

apps/isa-app/src/app/guards/can-activate-remission.guard.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
 import { ApplicationService } from '@core/application';
-import { BreadcrumbService } from '@core/breadcrumb';
 import { Config } from '@core/config';
 import { first } from 'rxjs/operators';
 
@@ -27,7 +26,8 @@ export class CanActivateRemissionGuard implements CanActivate {
     this._applicationService.activateProcess(this._config.get('process.ids.remission'));
 
     if (!!process?.data?.active && !state.url.includes(`/filiale/remission/${process?.data?.active}`)) {
-      await this._router.navigate(['/filiale', 'remission', process?.data?.active, 'list']);
+      const queryParams = process?.data?.queryParams ?? {};
+      await this._router.navigate(['/filiale', 'remission', process?.data?.active, 'list'], { queryParams });
       return false;
     } else {
       return true;

apps/isa-app/src/app/shell/shell.component.html

@@ -61,7 +61,7 @@
         <ui-icon icon="box_return" size="24px"></ui-icon>
         Abholfach
       </a>
-      <a [routerLink]="['/filiale/remission']" routerLinkActive="active">
+      <a [routerLink]="[remissionUrl$ | async]" [queryParams]="remissionQueryParams$ | async" routerLinkActive="active">
         <ui-icon icon="documents_refresh" size="24px"></ui-icon>
         Remission
       </a>

apps/isa-app/src/app/shell/shell.component.spec.ts

@@ -5,6 +5,7 @@ import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ApplicationProcess, ApplicationService } from '@core/application';
 import { AuthService } from '@core/auth';
+import { Config } from '@core/config';
 import { BreadcrumbService } from '@core/breadcrumb';
 import { DomainAvailabilityService } from '@domain/availability';
 import { DomainDashboardService } from '@domain/isa';
@@ -56,13 +57,14 @@ describe('ShellComponent', () => {
       MockComponent(ShellProcessTabComponent),
       MockComponent(UiIconComponent),
     ],
-    mocks: [BreadcrumbService, DomainAvailabilityService, AuthService, DomainDashboardService],
+    mocks: [BreadcrumbService, DomainAvailabilityService, AuthService, DomainDashboardService, Config],
   });
 
   beforeEach(() => {
     applicationServiceMock = createSpyObject(ApplicationService);
     applicationServiceMock.getSection$.and.returnValue(of('customer'));
     applicationServiceMock.getProcesses$.and.returnValue(of([]));
+    applicationServiceMock.getProcessById$.and.returnValue(of({ id: 4000 }));
     applicationServiceMock.getActivatedProcessId$.and.returnValue(of(undefined));
     applicationServiceMock.getLastActivatedProcessWithSectionAndType$.and.returnValue(of({}));
     applicationServiceMock.getLastActivatedProcessWithSection$.and.returnValue(of({}));
@@ -225,6 +227,63 @@ describe('ShellComponent', () => {
     });
   });
 
+  describe('remissionProcess$', () => {
+    it('should call _appService.getProcessById$() with Remission Id and return its value', async () => {
+      applicationServiceMock.getProcessById$.and.returnValue(of({ id: 4000 }));
+      await spectator.component.remissionProcess$.pipe(first()).toPromise();
+      expect(applicationServiceMock.getProcessById$).toHaveBeenCalled();
+    });
+  });
+
+  describe('remissionUrl$', () => {
+    it('should return the correct url if process.data.active is available', async () => {
+      const process = {
+        id: 4000,
+        data: {
+          active: 9999,
+        },
+      };
+      applicationServiceMock.getProcessById$.and.returnValue(of(process));
+      const url = await spectator.component.remissionUrl$.pipe(first()).toPromise();
+      expect(url).toBe('/filiale/remission/9999/list');
+    });
+
+    it('should return the correct url if process.data.active is not available', async () => {
+      const process = {
+        id: 4000,
+        data: {},
+      };
+      applicationServiceMock.getProcessById$.and.returnValue(of(process));
+      const url = await spectator.component.remissionUrl$.pipe(first()).toPromise();
+      expect(url).toBe('/filiale/remission');
+    });
+  });
+
+  describe('remissionQueryParams$', () => {
+    it('should return the correct queryParams if process.data.active and process.data.queryParams are available', async () => {
+      const process = {
+        id: 4000,
+        data: {
+          active: 9999,
+          queryParams: { filter: 'test' },
+        },
+      };
+      applicationServiceMock.getProcessById$.and.returnValue(of(process));
+      const queryParams = await spectator.component.remissionQueryParams$.pipe(first()).toPromise();
+      expect(queryParams).toEqual(process.data.queryParams);
+    });
+
+    it('should return the correct queryParams if process.data.active and process.data.queryParams are not available', async () => {
+      const process = {
+        id: 4000,
+        data: {},
+      };
+      applicationServiceMock.getProcessById$.and.returnValue(of(process));
+      const queryParams = await spectator.component.remissionQueryParams$.pipe(first()).toPromise();
+      expect(queryParams).toEqual({});
+    });
+  });
+
   describe('setSection()', () => {
     it('should call _appService.setSection() with the argument section', async () => {
       await spectator.component.setSection('customer');

apps/isa-app/src/app/shell/shell.component.ts

@@ -10,6 +10,7 @@ import { combineLatest } from 'rxjs';
 import { AuthService } from '@core/auth';
 import { DomainAvailabilityService } from '@domain/availability';
 import { ShellProcessTabComponent } from '@shell/process';
+import { Config } from '@core/config';
 
 @Component({
   selector: 'app-shell',
@@ -37,6 +38,22 @@ export class ShellComponent {
     return this.section$.pipe(switchMap((section) => this._appService.getProcesses$(section)));
   }
 
+  get remissionProcess$() {
+    return this._appService.getProcessById$(this._config.get('process.ids.remission'));
+  }
+
+  get remissionUrl$() {
+    return this.remissionProcess$.pipe(
+      map((process) => (process?.data?.active ? `/filiale/remission/${process.data.active}/list` : '/filiale/remission'))
+    );
+  }
+
+  get remissionQueryParams$() {
+    return this.remissionProcess$.pipe(
+      map((process) => (process?.data?.active && process?.data?.queryParams ? process.data.queryParams : {}))
+    );
+  }
+
   get addProcessLabel$() {
     return combineLatest([this.section$, this.processes$]).pipe(
       map(([section, processes]) => (section === 'customer' && processes.length === 0 ? 'VORGANG STARTEN' : ''))
@@ -53,6 +70,7 @@ export class ShellComponent {
 
   constructor(
     private readonly _appService: ApplicationService,
+    private readonly _config: Config,
     private readonly _notificationsHub: NotificationsHub,
     private readonly _modal: UiModalService,
     private readonly _router: Router,