Refactoring

apps/client/src/app/components/admin-users/admin-users.component.ts

@@ -278,9 +278,9 @@ export class GfAdminUsersComponent implements OnDestroy, OnInit {
       });
   }
 
-  private openUserDetailDialog(userId: string) {
+  private openUserDetailDialog(aUserId: string) {
     const userData = this.dataSource.data.find(({ id }) => {
-      return id === userId;
+      return id === aUserId;
     });
 
     if (!userData) {
@@ -293,6 +293,7 @@ export class GfAdminUsersComponent implements OnDestroy, OnInit {
       data: {
         userData,
         deviceType: this.deviceType,
+        hasPermissionForSubscription: this.hasPermissionForSubscription,
         locale: this.user?.settings?.locale
       } as UserDetailDialogParams,
       height: this.deviceType === 'mobile' ? '98vh' : '60vh',

apps/client/src/app/components/user-detail-dialog/interfaces/interfaces.ts

@@ -2,6 +2,7 @@ import { AdminUsers } from '@ghostfolio/common/interfaces';
 
 export interface UserDetailDialogParams {
   deviceType: string;
+  hasPermissionForSubscription: boolean;
   locale: string;
   userData: AdminUsers['users'][0];
 }

apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html

@@ -31,11 +31,13 @@
           Role
         </gf-value>
       </div>
-      <div class="col-6 mb-3">
-        <gf-value i18n size="medium" [value]="data.userData.country">
-          Country
-        </gf-value>
-      </div>
+      @if (data.hasPermissionForSubscription) {
+        <div class="col-6 mb-3">
+          <gf-value i18n size="medium" [value]="data.userData.country">
+            Country
+          </gf-value>
+        </div>
+      }
     </div>
 
     <div class="mb-3 row">
@@ -61,29 +63,31 @@
       </div>
     </div>
 
-    <div class="mb-3 row">
-      <div class="col-6 mb-3">
-        <gf-value
-          i18n
-          size="medium"
-          [locale]="data.locale"
-          [precision]="0"
-          [value]="data.userData.engagement"
-        >
-          Engagement per Day
-        </gf-value>
-      </div>
-      <div class="col-6 mb-3">
-        <gf-value
-          i18n
-          size="medium"
-          [locale]="data.locale"
-          [value]="data.userData.dailyApiRequests"
-        >
-          API Requests Today
-        </gf-value>
+    @if (data.hasPermissionForSubscription) {
+      <div class="mb-3 row">
+        <div class="col-6 mb-3">
+          <gf-value
+            i18n
+            size="medium"
+            [locale]="data.locale"
+            [precision]="0"
+            [value]="data.userData.engagement"
+          >
+            Engagement per Day
+          </gf-value>
+        </div>
+        <div class="col-6 mb-3">
+          <gf-value
+            i18n
+            size="medium"
+            [locale]="data.locale"
+            [value]="data.userData.dailyApiRequests"
+          >
+            API Requests Today
+          </gf-value>
+        </div>
       </div>
-    </div>
+    }
   </div>
 </div>