From ac377c73719e99b5142927543200e21bcd58ab8d Mon Sep 17 00:00:00 2001
From: Basim Mohammed <107759928+Basimohd@users.noreply.github.com>
Date: Wed, 11 Oct 2023 14:08:40 +0530
Subject: [PATCH] Updated displayedColumn and formatted

---
 .../admin-users/admin-users.component.ts      | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/apps/client/src/app/components/admin-users/admin-users.component.ts b/apps/client/src/app/components/admin-users/admin-users.component.ts
index 77fba46b1..e9d39e55c 100644
--- a/apps/client/src/app/components/admin-users/admin-users.component.ts
+++ b/apps/client/src/app/components/admin-users/admin-users.component.ts
@@ -32,12 +32,9 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
   public displayedColumns = [
     'index',
     'user',
-    'country',
     'registration',
     'accounts',
     'activities',
-    'engagementPerDay',
-    'lastRequest',
     'actions'
   ];
   private unsubscribeSubject = new Subject<void>();
@@ -56,6 +53,29 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
       permissions.enableSubscription
     );
 
+    if (this.hasPermissionForSubscription) {
+      this.displayedColumns = [
+        'index',
+        'user',
+        'country',
+        'registration',
+        'accounts',
+        'activities',
+        'engagementPerDay',
+        'lastRequest',
+        'actions'
+      ];
+    } else {
+      this.displayedColumns = [
+        'index',
+        'user',
+        'registration',
+        'accounts',
+        'activities',
+        'actions'
+      ];
+    }
+
     this.userService.stateChanged
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe((state) => {
@@ -130,7 +150,7 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
       .fetchAdminData()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(({ users }) => {
-        this.dataSource = new MatTableDataSource(users)
+        this.dataSource = new MatTableDataSource(users);
         this.changeDetectorRef.markForCheck();
       });
   }