fix(ui): adapt admin's UI to new Get User response schema

Author: luizhf42

ui/admin/src/components/User/UserList.vue

@@ -20,9 +20,6 @@
         <td :username-test="item.username">
           {{ item.username }}
         </td>
-        <td :namespaces-test="item.namespaces">
-          {{ item.namespaces }}
-        </td>
         <td>
           <UserStatusChip :status="item.status" />
         </td>
@@ -109,10 +106,6 @@ const headers = [
     text: "Username",
     value: "username",
   },
-  {
-    text: "Namespaces",
-    value: "namespaces",
-  },
   {
     text: "Status",
     value: "status",

ui/admin/src/interfaces/IUser.ts

@@ -4,15 +4,18 @@ export type UserAuthMethods = Array<"saml" | "local">;
 
 export interface IAdminUser {
   id: string;
-  namespaces: number;
+  namespacesOwned: number;
   max_namespaces: number;
   status: UserStatus;
   created_at: string;
   last_login: string;
   name: string;
-  email: string;
   username: string;
-  password: string;
+  email: string;
+  recovery_email: string;
+  mfa: {
+    enabled: boolean;
+  }
   preferences: {
     auth_methods: UserAuthMethods;
   }

ui/admin/src/store/modules/users.ts

@@ -32,7 +32,7 @@ const useUsersStore = defineStore("users", () => {
 
   const fetchUserById = async (id: string) => {
     const { data } = await usersApi.getUser(id);
-    return data.user as IAdminUser;
+    return data as IAdminUser;
   };
 
   const updateUser = async (data: IAdminUserFormData) => {

ui/admin/src/views/UserDetails.vue

@@ -34,8 +34,8 @@
       </div>
 
       <div>
-        <h3 class="text-overline mt-3">Namespaces:</h3>
-        <p :data-test="currentUser.namespaces">{{ currentUser.namespaces }}</p>
+        <h3 class="text-overline mt-3">Owned namespaces:</h3>
+        <p :data-test="currentUser.namespacesOwned">{{ currentUser.namespacesOwned }}</p>
       </div>
     </v-card-text>
     <p v-else class="text-center">Something is wrong, try again !</p>

ui/admin/tests/unit/components/User/UserFormDialog/index.spec.ts

@@ -11,10 +11,11 @@ const user: IAdminUser = {
   id: "5f1996c84d2190a22d5857bb",
   name: "Antony",
   email: "[email protected]",
+  recovery_email: "[email protected]",
+  mfa: { enabled: false },
   username: "antony",
-  password: "123456789",
   status: "confirmed",
-  namespaces: 1,
+  namespacesOwned: 1,
   max_namespaces: 10,
   created_at: "2023-10-01T12:00:00Z",
   last_login: "2023-10-01T12:00:00Z",

ui/admin/tests/unit/components/User/UserList/__snapshots__/index.spec.ts.snap

@@ -11,7 +11,6 @@ exports[`UserList > Renders the component 1`] = `
             <th class="text-center" data-test="th-name"><span data-test="th-label">Name</span></th>
             <th class="text-center" data-test="th-email"><span data-test="th-label">Email</span></th>
             <th class="text-center" data-test="th-username"><span data-test="th-label">Username</span></th>
-            <th class="text-center" data-test="th-namespaces"><span data-test="th-label">Namespaces</span></th>
             <th class="text-center" data-test="th-status"><span data-test="th-label">Status</span></th>
             <th class="text-center" data-test="th-actions"><span data-test="th-label">Actions</span></th>
           </tr>
@@ -21,7 +20,6 @@ exports[`UserList > Renders the component 1`] = `
             <td name-test="antony">antony</td>
             <td email-test="[email protected]">[email protected]</td>
             <td username-test="antony">antony</td>
-            <td namespaces-test="2">2</td>
             <td><span class="v-chip v-theme--light text-success v-chip--density-default v-chip--size-default v-chip--variant-text ma-2" draggable="false"><!----><span class="v-chip__underlay"></span>
               <!---->
               <div class="v-chip__prepend"><i class="mdi-checkbox-marked-circle mdi v-icon notranslate v-theme--light v-icon--size-default v-icon--start" aria-hidden="true"></i>

ui/admin/tests/unit/components/User/UserList/index.spec.ts

@@ -6,18 +6,20 @@ import useUsersStore from "@admin/store/modules/users";
 import UserList from "@admin/components/User/UserList.vue";
 import routes from "@admin/router";
 import { SnackbarPlugin } from "@/plugins/snackbar";
+import { IAdminUser } from "@admin/interfaces/IUser";
 
-const mockUsers = [
+const mockUsers: IAdminUser[] = [
   {
     status: "confirmed" as const,
     created_at: "2022-04-13T11:42:49.578Z",
     email: "[email protected]",
+    recovery_email: "[email protected]",
+    mfa: { enabled: false },
     id: "6256b739302b50b6cc5eafcc",
     last_login: "0001-01-01T00:00:00Z",
     name: "antony",
-    namespaces: 2,
+    namespacesOwned: 2,
     max_namespaces: 5,
-    password: "dummy",
     username: "antony",
     preferences: {
       auth_methods: ["saml" as const],
@@ -59,6 +61,5 @@ describe("UserList", async () => {
     expect(wrapper.find("[name-test]").text()).toContain(mockUsers[0].name);
     expect(wrapper.find("[email-test]").text()).toContain(mockUsers[0].email);
     expect(wrapper.find("[username-test]").text()).toContain(mockUsers[0].username);
-    expect(wrapper.find("[namespaces-test]").text()).toContain(String(mockUsers[0].namespaces));
   });
 });

ui/admin/tests/unit/store/modules/users.spec.ts

@@ -9,21 +9,18 @@ const users = [
     name: "user",
     email: "[email protected]",
     username: "username",
-    password: "hash_password",
   },
   {
     id: "xxxxxxx2",
     name: "user2",
     email: "[email protected]",
     username: "username2",
-    password: "hash_password2",
   },
   {
     id: "xxxxxxx3",
     name: "user3",
     email: "[email protected]",
     username: "username3",
-    password: "hash_password3",
   },
 ];
 

ui/admin/tests/unit/views/UserDetails/__snapshots__/index.spec.ts.snap

@@ -53,8 +53,8 @@ exports[`User Details > Renders the component 1`] = `
       <p data-test="antony">antony</p>
     </div>
     <div>
-      <h3 class="text-overline mt-3">Namespaces:</h3>
-      <p data-test="0">0</p>
+      <h3 class="text-overline mt-3">Owned namespaces:</h3>
+      <p data-test="2">2</p>
     </div>
   </div>
   <!---->

ui/admin/tests/unit/views/UserDetails/index.spec.ts

@@ -15,9 +15,8 @@ const user = {
   id: "6256b739302b50b6cc5eafcc",
   last_login: "0001-01-01T00:00:00Z",
   name: "antony",
-  namespaces: 0,
-  password: "somepassword",
   username: "antony",
+  namespacesOwned: 2,
 };
 
 describe("User Details", async () => {
@@ -72,7 +71,6 @@ describe("User Details", async () => {
     expect(wrapper.find(`[data-test='${user.id}']`).text()).toContain(user.id);
     expect(wrapper.find(`[data-test='${user.email}']`).text()).toContain(user.email);
     expect(wrapper.find(`[data-test='${user.username}']`).text()).toContain(user.username);
-    expect(wrapper.find(`[data-test='${user.namespaces}']`).text()).toContain(`${user.namespaces}`);
   });
 
   it("Should render the correct buttons", () => {