feat: show inactive flag for costcenterusers(#958)

intershop · Sep 30, 2022 · 752e38e · 752e38e
1 parent 295e122
commit 752e38e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/...anagement/src/app/components/cost-center-users-list/cost-center-users-list.component.html b/...anagement/src/app/components/cost-center-users-list/cost-center-users-list.component.html
@@ -22,6 +22,9 @@
           <ng-container *ishHasNotRole="'APP_B2B_ACCOUNT_OWNER'">
             {{ buyer.firstName }} {{ buyer.lastName }}
           </ng-container>
+          <span *ngIf="buyer.active === false" class="input-help">
+            <br />{{ 'account.user.list.status.inactive' | translate }}
+          </span>
         </td>
       </ng-container>
 

diff --git a/...nization-management/src/app/pages/cost-center-buyers/cost-center-buyers-page.component.ts b/...nization-management/src/app/pages/cost-center-buyers/cost-center-buyers-page.component.ts
@@ -1,6 +1,7 @@
 import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { FormlyFieldConfig } from '@ngx-formly/core';
+import { TranslateService } from '@ngx-translate/core';
 import { Observable, Subject, merge } from 'rxjs';
 import { take, takeUntil, withLatestFrom } from 'rxjs/operators';
 
@@ -50,7 +51,11 @@ export class CostCenterBuyersPageComponent implements OnDestroy, OnInit {
 
   private destroy$ = new Subject<void>();
 
-  constructor(private appFacade: AppFacade, private organizationManagementFacade: OrganizationManagementFacade) {}
+  constructor(
+    private appFacade: AppFacade,
+    private organizationManagementFacade: OrganizationManagementFacade,
+    private translateService: TranslateService
+  ) {}
 
   ngOnInit() {
     this.loading$ = this.organizationManagementFacade.costCentersLoading$;
@@ -59,7 +64,6 @@ export class CostCenterBuyersPageComponent implements OnDestroy, OnInit {
       this.organizationManagementFacade.usersError$
     );
     this.buyers$ = this.organizationManagementFacade.costCenterUnassignedBuyers$();
-
     // set model and form fields
     this.buyers$
       .pipe(withLatestFrom(this.appFacade.currentCurrency$), take(1), takeUntil(this.destroy$))
@@ -70,10 +74,13 @@ export class CostCenterBuyersPageComponent implements OnDestroy, OnInit {
   }
 
   getModel(buyers: B2bUser[], currency: string) {
+    const inactivetext = this.translateService.instant('account.user.list.status.inactive');
     return {
       addBuyers: buyers.map(buyer => ({
         selected: false,
-        name: `${buyer.firstName} ${buyer.lastName}`,
+        name: `${buyer.firstName} ${buyer.lastName} ${
+          !buyer.active ? `<p class="input-help">${inactivetext}</p>` : ''
+        } `,
         login: buyer.login,
         budgetValue: undefined,
         currency,
@@ -102,7 +109,7 @@ export class CostCenterBuyersPageComponent implements OnDestroy, OnInit {
             },
             {
               key: 'name',
-              type: 'ish-plain-text-field',
+              type: 'ish-html-text-field',
               className: 'col-11 col-sm-10 col-md-3 list-item pb-0',
               templateOptions: {
                 inputClass: 'col-form-label pb-0',