test: test the dashboard admins property

src/lib/db/account-store.ts

@@ -4,7 +4,7 @@ import User from '../types/user';
 import NotFoundError from '../error/notfound-error';
 import type { IUserLookup } from '../types/stores/user-store';
 import type { IAdminCount } from '../types/stores/account-store';
-import type { IAccountStore, MinimalUser } from '../types';
+import type { IAccountStore, MinimalUiUser } from '../types';
 import type { Db } from './db';
 
 const TABLE = 'users';
@@ -199,14 +199,15 @@ export class AccountStore implements IAccountStore {
         };
     }
 
-    async getAdmins(): Promise<MinimalUser[]> {
+    async getAdmins(): Promise<MinimalUiUser[]> {
         const rowToAdminUser = (row) => {
+            const user = rowToUser(row);
             return {
-                id: row.id,
-                name: emptify(row.name),
-                username: emptify(row.username),
-                email: emptify(row.email),
-                imageUrl: emptify(row.image_url),
+                id: user.id,
+                name: user.name,
+                username: user.username,
+                email: user.email,
+                imageUrl: user.imageUrl,
             };
         };
 

src/lib/features/personal-dashboard/personal-dashboard-controller.e2e.test.ts

@@ -217,3 +217,52 @@ test('should return personal dashboard project details', async () => {
         ],
     });
 });
+
+test('should return Unleash admins', async () => {
+    await loginUser('[email protected]');
+    const adminRoleId = 1;
+    const userService = app.services.userService;
+
+    const admin = await userService.createUser({
+        username: 'admin',
+        rootRole: adminRoleId,
+    });
+    const admin2 = await userService.createUser({
+        username: 'John',
+        name: 'John Admin',
+        rootRole: adminRoleId,
+    });
+
+    // service account that shouldn't be listed in the output. Service
+    // accounts are enterprise functionality, so there's no service to
+    // call here
+    const [{ id: serviceAdminId }] = await db
+        .rawDatabase('users')
+        .insert({
+            username: 'service_admin',
+            is_service: true,
+        })
+        .returning('*');
+    await app.services.accessService.setUserRootRole(
+        serviceAdminId,
+        adminRoleId,
+    );
+
+    const { body } = await app.request.get(`/api/admin/personal-dashboard`);
+
+    const admins = body.admins;
+    admins.sort((a, b) => a.id - b.id);
+    expect(body.admins).toMatchObject([
+        {
+            id: admin.id,
+            username: admin.username,
+            imageUrl: expect.stringMatching(/^https:\/\/gravatar.com/),
+        },
+        {
+            id: admin2.id,
+            name: admin2.name,
+            username: admin2.username,
+            imageUrl: expect.stringMatching(/^https:\/\/gravatar.com/),
+        },
+    ]);
+});

src/lib/features/personal-dashboard/personal-dashboard-service.ts

@@ -13,7 +13,7 @@ import type {
     IAccountStore,
     IEventStore,
     IOnboardingReadModel,
-    MinimalUser,
+    MinimalUiUser,
 } from '../../types';
 import type { FeatureEventFormatter } from '../../addons/feature-event-formatter-md';
 import { generateImageUrl } from '../../util';
@@ -126,7 +126,7 @@ export class PersonalDashboardService {
         return { latestEvents: formattedEvents, onboardingStatus };
     }
 
-    async getAdmins(): Promise<MinimalUser[]> {
+    async getAdmins(): Promise<MinimalUiUser[]> {
         return this.accountStore.getAdmins();
     }
 }

src/lib/types/stores/account-store.ts

@@ -1,4 +1,4 @@
-import type { IUser, MinimalUser } from '../user';
+import type { IUser, MinimalUiUser } from '../user';
 import type { Store } from './store';
 
 export interface IUserLookup {
@@ -22,5 +22,5 @@ export interface IAccountStore extends Store<IUser, number> {
     getAccountByPersonalAccessToken(secret: string): Promise<IUser>;
     markSeenAt(secrets: string[]): Promise<void>;
     getAdminCount(): Promise<IAdminCount>;
-    getAdmins(): Promise<MinimalUser[]>;
+    getAdmins(): Promise<MinimalUiUser[]>;
 }

src/lib/types/user.ts

@@ -33,7 +33,7 @@ export interface IUser {
     scimId?: string;
 }
 
-export type MinimalUser = Pick<
+export type MinimalUiUser = Pick<
     IUser,
     'id' | 'name' | 'username' | 'email' | 'imageUrl'
 >;