fix: fix oci routing

intershop · Jul 15, 2024 · dfc873b · dfc873b
1 parent 8cb50c6
commit dfc873b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/...count-punchout-configuration/oci-configuration-form/oci-configuration-form.component.html b/...count-punchout-configuration/oci-configuration-form/oci-configuration-form.component.html
@@ -60,7 +60,7 @@
         >
           {{ 'account.update.button.label' | translate }}
         </button>
-        <a [routerLink]="['/account/punchout', { format: 'oci' }]" class="btn btn-secondary">{{
+        <a [routerLink]="['/account/punchout']" [queryParams]="{ format: 'oci' }" class="btn btn-secondary">{{
           'account.cancel.link' | translate
         }}</a>
       </div>

diff --git a/...out/pages/account-punchout/account-punchout-header/account-punchout-header.component.html b/...out/pages/account-punchout/account-punchout-header/account-punchout-header.component.html
@@ -16,7 +16,7 @@ <h1>
 <div *ngIf="punchoutTypes?.length > 1">
   <ul ngbNav class="nav-tabs section" [(activeId)]="selectedType">
     <li *ngFor="let type of punchoutTypes" [ngbNavItem]="type" role="presentation">
-      <a ngbNavLink [routerLink]="['../punchout']" [queryParams]="{ format: type }">{{
+      <a ngbNavLink [routerLink]="['../punchout']" [queryParams]="{ format: type }" class="mb-0">{{
         'account.punchout.type.text' | translate : { '0': type }
       }}</a>
     </li>

diff --git a/src/app/extensions/punchout/shared/punchout-user-form/punchout-user-form.component.html b/src/app/extensions/punchout/shared/punchout-user-form/punchout-user-form.component.html
@@ -5,7 +5,9 @@
       <button type="submit" class="btn btn-primary" [disabled]="formDisabled" data-testing-id="punchout-user-submit">
         {{ (punchoutUser ? 'account.update.button.label' : 'account.user.new.button.create.label') | translate }}
       </button>
-      <a routerLink="../" class="btn btn-secondary">{{ 'account.cancel.link' | translate }}</a>
+      <a [routerLink]="['../']" [queryParams]="{ format: punchoutType }" class="btn btn-secondary">{{
+        'account.cancel.link' | translate
+      }}</a>
     </div>
   </div>
 </form>
diff --git a/src/app/extensions/punchout/shared/punchout-user-form/punchout-user-form.component.spec.ts b/src/app/extensions/punchout/shared/punchout-user-form/punchout-user-form.component.spec.ts
@@ -1,5 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
+import { RouterTestingModule } from '@angular/router/testing';
 import { FormlyForm } from '@ngx-formly/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { MockComponent } from 'ng-mocks';
@@ -13,7 +14,7 @@ describe('Punchout User Form Component', () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      imports: [ReactiveFormsModule, TranslateModule.forRoot()],
+      imports: [ReactiveFormsModule, RouterTestingModule, TranslateModule.forRoot()],
       declarations: [MockComponent(FormlyForm), PunchoutUserFormComponent],
     }).compileComponents();
   });

diff --git a/src/app/extensions/punchout/store/punchout-users/punchout-users.effects.spec.ts b/src/app/extensions/punchout/store/punchout-users/punchout-users.effects.spec.ts
@@ -147,7 +147,7 @@ describe('Punchout Users Effects', () => {
               message: "account.punchout.user.created.message"
               messageParams: {"0":"[email protected]"}
           `);
-          expect(location.path()).toMatchInlineSnapshot(`"/account/punchout;format=oci"`);
+          expect(location.path()).toMatchInlineSnapshot(`"/account/punchout?format=oci"`);
         },
         error: fail,
         complete: done,
@@ -191,7 +191,7 @@ describe('Punchout Users Effects', () => {
               message: "account.punchout.user.updated.message"
               messageParams: {"0":"[email protected]"}
           `);
-          expect(location.path()).toMatchInlineSnapshot(`"/account/punchout;format=oci"`);
+          expect(location.path()).toMatchInlineSnapshot(`"/account/punchout?format=oci"`);
         },
         error: fail,
         complete: done,

diff --git a/src/app/extensions/punchout/store/punchout-users/punchout-users.effects.ts b/src/app/extensions/punchout/store/punchout-users/punchout-users.effects.ts
@@ -80,7 +80,7 @@ export class PunchoutUsersEffects {
       concatMap(newUser =>
         this.punchoutService.createUser(newUser).pipe(
           concatMap(user =>
-            from(this.router.navigate([`/account/punchout`, { format: user.punchoutType }])).pipe(
+            from(this.router.navigate([`/account/punchout`], { queryParams: { format: user.punchoutType } })).pipe(
               mergeMap(() => [
                 addPunchoutUserSuccess({ user }),
                 displaySuccessMessage({
@@ -103,7 +103,7 @@ export class PunchoutUsersEffects {
       concatMap(changedUser =>
         this.punchoutService.updateUser(changedUser).pipe(
           concatMap(user =>
-            from(this.router.navigate([`/account/punchout`, { format: user.punchoutType }])).pipe(
+            from(this.router.navigate([`/account/punchout`], { queryParams: { format: user.punchoutType } })).pipe(
               mergeMap(() => [
                 updatePunchoutUserSuccess({ user }),
                 displaySuccessMessage({