renamed requisitionStatus to just status (for nicer route parameters)

intershop · Aug 27, 2020 · 34f17e7 · 34f17e7
1 parent b8848ad
commit 34f17e7
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 31 deletions.
diff --git a/...uisition-management/src/app/components/requisitions-list/requisitions-list.component.html b/...uisition-management/src/app/components/requisitions-list/requisitions-list.component.html
@@ -12,7 +12,7 @@
       </th>
       <td cdk-cell *cdkCellDef="let requisition" [attr.data-th]="'account.approvallist.table.id_of_order' | translate">
         <!-- TODO: routing must work for standalone usage, needs to be more relative without the 'account' part -->
-        <a [routerLink]="[requisition.id, { requisitionStatus: requisitionStatus }]">{{ requisition.requisitionNo }}</a>
+        <a [routerLink]="[requisition.id, { status: status }]">{{ requisition.requisitionNo }}</a>
       </td>
     </ng-container>
 

diff --git a/...equisition-management/src/app/components/requisitions-list/requisitions-list.component.ts b/...equisition-management/src/app/components/requisitions-list/requisitions-list.component.ts
@@ -12,6 +12,6 @@ export class RequisitionsListComponent {
    * The requisitions to be listed
    */
   @Input() requisitions: Requisition[];
-  @Input() requisitionStatus: RequisitionStatus = 'pending';
+  @Input() status: RequisitionStatus = 'pending';
   @Input() columnsToDisplay: string[];
 }
diff --git a/projects/requisition-management/src/app/facades/requisition-management.facade.ts b/projects/requisition-management/src/app/facades/requisition-management.facade.ts
@@ -25,13 +25,13 @@ export class RequisitionManagementFacade {
   requisitionsLoading$ = this.store.pipe(select(getRequisitionsLoading));
 
   requisitionsStatus$ = this.store.pipe(
-    select(selectRouteParam('requisitionStatus')),
+    select(selectRouteParam('status')),
     map(status => status || 'pending')
   );
   selectedRequisition$ = this.store.pipe(select(getRequisition));
 
   requisitions$ = combineLatest([
-    this.store.pipe(select(selectRouteParam('requisitionStatus')), distinctUntilChanged()),
+    this.store.pipe(select(selectRouteParam('status')), distinctUntilChanged()),
     this.store.pipe(
       select(selectUrl),
       map(url => (url.includes('/buyer') ? 'buyer' : 'approver')),

diff --git a/projects/requisition-management/src/app/pages/approver/approver-page.component.html b/projects/requisition-management/src/app/pages/approver/approver-page.component.html
@@ -4,25 +4,19 @@ <h1>{{ 'account.requisitions.approvals' | translate }}</h1>
 
 <ul ngbNav class="nav-tabs" [(activeId)]="status">
   <li ngbNavItem="pending">
-    <a ngbNavLink [routerLink]="['../approver', { requisitionStatus: 'pending' }]" data-testing-id="tab-link-pending">{{
+    <a ngbNavLink [routerLink]="['../approver', { status: 'pending' }]" data-testing-id="tab-link-pending">{{
       'account.requisitions.approvals.navtab.waiting' | translate
     }}</a>
   </li>
   <li ngbNavItem="approved">
-    <a
-      ngbNavLink
-      [routerLink]="['../approver', { requisitionStatus: 'approved' }]"
-      data-testing-id="tab-link-approved"
-      >{{ 'account.requisitions.approvals.navtab.approved' | translate }}</a
-    >
+    <a ngbNavLink [routerLink]="['../approver', { status: 'approved' }]" data-testing-id="tab-link-approved">{{
+      'account.requisitions.approvals.navtab.approved' | translate
+    }}</a>
   </li>
   <li ngbNavItem="rejected">
-    <a
-      ngbNavLink
-      [routerLink]="['../approver', { requisitionStatus: 'rejected' }]"
-      data-testing-id="tab-link-rejected"
-      >{{ 'account.requisitions.approvals.navtab.rejected' | translate }}</a
-    >
+    <a ngbNavLink [routerLink]="['../approver', { status: 'rejected' }]" data-testing-id="tab-link-rejected">{{
+      'account.requisitions.approvals.navtab.rejected' | translate
+    }}</a>
   </li>
 </ul>
 
@@ -31,7 +25,7 @@ <h1>{{ 'account.requisitions.approvals' | translate }}</h1>
 
   <ish-requisitions-list
     [requisitions]="requisitions$ | async"
-    [requisitionStatus]="status"
+    [status]="status"
     [columnsToDisplay]="columnsToDisplay"
   ></ish-requisitions-list>
 

diff --git a/projects/requisition-management/src/app/pages/buyer/buyer-page.component.html b/projects/requisition-management/src/app/pages/buyer/buyer-page.component.html
@@ -4,17 +4,17 @@ <h1>{{ 'account.requisitions.requisitions' | translate }}</h1>
 
 <ul ngbNav class="nav-tabs" [(activeId)]="status">
   <li ngbNavItem="pending">
-    <a ngbNavLink [routerLink]="['../buyer', { requisitionStatus: 'pending' }]" data-testing-id="tab-link-pending">{{
+    <a ngbNavLink [routerLink]="['../buyer', { status: 'pending' }]" data-testing-id="tab-link-pending">{{
       'account.requisitions.requisitions.navtab.pending' | translate
     }}</a>
   </li>
   <li ngbNavItem="approved">
-    <a ngbNavLink [routerLink]="['../buyer', { requisitionStatus: 'approved' }]" data-testing-id="tab-link-approved">{{
+    <a ngbNavLink [routerLink]="['../buyer', { status: 'approved' }]" data-testing-id="tab-link-approved">{{
       'account.requisitions.requisitions.navtab.approved' | translate
     }}</a>
   </li>
   <li ngbNavItem="rejected">
-    <a ngbNavLink [routerLink]="['../buyer', { requisitionStatus: 'rejected' }]" data-testing-id="tab-link-rejected">{{
+    <a ngbNavLink [routerLink]="['../buyer', { status: 'rejected' }]" data-testing-id="tab-link-rejected">{{
       'account.requisitions.requisitions.navtab.rejected' | translate
     }}</a>
   </li>
@@ -25,7 +25,7 @@ <h1>{{ 'account.requisitions.requisitions' | translate }}</h1>
 
   <ish-requisitions-list
     [requisitions]="requisitions$ | async"
-    [requisitionStatus]="status$ | async"
+    [status]="status$ | async"
     [columnsToDisplay]="columnsToDisplay"
   ></ish-requisitions-list>
 

diff --git a/...sition-management/src/app/pages/requisition-detail/requisition-detail-page.component.html b/...sition-management/src/app/pages/requisition-detail/requisition-detail-page.component.html
@@ -86,7 +86,7 @@ <h3>{{ 'checkout.order_summary.heading' | translate }}</h3>
   ></ish-requisition-reject-dialog>
 
   <div class="section d-flex d-flex justify-content-between">
-    <a [routerLink]="['../', { requisitionStatus: requisition.approval.statusCode }]">
+    <a [routerLink]="['../', { status: requisition.approval.statusCode }]">
       <ng-container *ngIf="view === 'buyer'; else backToApprovals">
         {{ 'approval.detailspage.links.return_to_requisitions' | translate }}
       </ng-container>

diff --git a/...vices/requisition-management-breadcrumb/requisition-management-breadcrumb.service.spec.ts b/...vices/requisition-management-breadcrumb/requisition-management-breadcrumb.service.spec.ts
@@ -98,7 +98,7 @@ describe('Requisition Management Breadcrumb Service', () => {
     });
 
     it('should set breadcrumb for requisitions buyer detail view', done => {
-      router.navigateByUrl('/requisitions/buyer/12345;requisitionStatus=pending');
+      router.navigateByUrl('/requisitions/buyer/12345;status=pending');
       requisitionManagementBreadcrumbService.breadcrumb$('/my-account').subscribe(breadcrumbData => {
         expect(breadcrumbData).toMatchInlineSnapshot(`
           Array [
@@ -107,7 +107,7 @@ describe('Requisition Management Breadcrumb Service', () => {
               "link": Array [
                 "/my-account/buyer",
                 Object {
-                  "requisitionStatus": "pending",
+                  "status": "pending",
                 },
               ],
             },
@@ -121,7 +121,7 @@ describe('Requisition Management Breadcrumb Service', () => {
     });
 
     it('should set breadcrumb for requisitions buyer detail view', done => {
-      router.navigateByUrl('/requisitions/approver/12345;requisitionStatus=rejected');
+      router.navigateByUrl('/requisitions/approver/12345;status=rejected');
       requisitionManagementBreadcrumbService.breadcrumb$('/my-account').subscribe(breadcrumbData => {
         expect(breadcrumbData).toMatchInlineSnapshot(`
           Array [
@@ -130,7 +130,7 @@ describe('Requisition Management Breadcrumb Service', () => {
               "link": Array [
                 "/my-account/approver",
                 Object {
-                  "requisitionStatus": "rejected",
+                  "status": "rejected",
                 },
               ],
             },

diff --git a/...p/services/requisition-management-breadcrumb/requisition-management-breadcrumb.service.ts b/...p/services/requisition-management-breadcrumb/requisition-management-breadcrumb.service.ts
@@ -36,14 +36,14 @@ export class RequisitionManagementBreadcrumbService {
             whenTruthy(),
             withLatestFrom(
               this.translateService.get('approval.details.breadcrumb.order.label'),
-              this.store.pipe(select(selectRouteParam('requisitionStatus')))
+              this.store.pipe(select(selectRouteParam('status')))
             ),
             map(([req, translation, status]) =>
               path.includes('/approver/')
                 ? [
                     {
                       key: 'account.requisitions.approvals',
-                      link: [prefix + '/approver', { requisitionStatus: status }],
+                      link: [prefix + '/approver', { status }],
                     },
                     {
                       text: `${translation} - ${req.requisitionNo}`,
@@ -52,7 +52,7 @@ export class RequisitionManagementBreadcrumbService {
                 : [
                     {
                       key: 'account.requisitions.requisitions',
-                      link: [prefix + '/buyer', { requisitionStatus: status }],
+                      link: [prefix + '/buyer', { status }],
                     },
                     {
                       text: `${translation} - ${req.requisitionNo}`,

diff --git a/projects/requisition-management/src/app/store/requisitions/requisitions.effects.ts b/projects/requisition-management/src/app/store/requisitions/requisitions.effects.ts
@@ -79,7 +79,7 @@ export class RequisitionsEffects {
               /* ToDo: use only relative routes */
               this.router.navigate([
                 `/account/requisitions/approver/${requisition.id}`,
-                { requisitionStatus: requisition.approval?.statusCode },
+                { status: requisition.approval?.statusCode },
               ])
             ),
             map(requisition => updateRequisitionStatusSuccess({ requisition })),