fix frontend build

rommapp · May 14, 2024 · 62bfa69 · 62bfa69
1 parent 8b5f907
commit 62bfa69
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/frontend/src/components/Dialog/User/DeleteUser.vue b/frontend/src/components/Dialog/User/DeleteUser.vue
@@ -11,7 +11,7 @@ const usersStore = storeUsers();
 
 const emitter = inject<Emitter<Events>>("emitter");
 emitter?.on("showDeleteUserDialog", (userToDelete) => {
-  user.value = userToDelete;
+  user.value = { password: "", ...userToDelete };
   show.value = true;
 });
 

diff --git a/frontend/src/components/Dialog/User/EditUser.vue b/frontend/src/components/Dialog/User/EditUser.vue
@@ -13,7 +13,7 @@ const usersStore = storeUsers();
 const imagePreviewUrl = ref<string | undefined>("");
 const emitter = inject<Emitter<Events>>("emitter");
 emitter?.on("showEditUserDialog", (userToEdit) => {
-  user.value = { ...userToEdit, avatar: undefined };
+  user.value = { ...userToEdit, password: "", avatar: undefined };
   show.value = true;
 });
 

diff --git a/frontend/src/services/api/user.ts b/frontend/src/services/api/user.ts
@@ -30,17 +30,10 @@ async function fetchCurrentUser(): Promise<{ data: UserSchema | null }> {
 
 async function updateUser({
   id,
-  username,
-  password,
-  role,
-  enabled,
   avatar,
+  ...attrs
 }: {
   id: number;
-  username: string;
-  password: string;
-  role: string;
-  enabled: boolean;
   avatar?: File[];
 }): Promise<{ data: UserSchema }> {
   return api.put(
@@ -52,7 +45,7 @@ async function updateUser({
       headers: {
         "Content-Type": avatar ? "multipart/form-data" : "application/json",
       },
-      params: { username, password, role, enabled },
+      params: attrs,
     }
   );
 }

diff --git a/frontend/src/types/emitter.d.ts b/frontend/src/types/emitter.d.ts
@@ -44,8 +44,8 @@ export type Events = {
   };
   showCreateExclusionDialog: { exclude: string };
   showCreateUserDialog: null;
-  showEditUserDialog: UserItem;
-  showDeleteUserDialog: UserItem;
+  showEditUserDialog: User;
+  showDeleteUserDialog: User;
   showDeleteSavesDialog: {
     rom: Rom;
     saves: SaveSchema[];

diff --git a/frontend/src/views/Settings/ControlPanel/Users/Base.vue b/frontend/src/views/Settings/ControlPanel/Users/Base.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import userApi from "@/services/api/user";
 import storeAuth from "@/stores/auth";
-import storeUsers from "@/stores/users";
-import type { Events, UserItem } from "@/types/emitter";
+import storeUsers, { type User } from "@/stores/users";
+import type { Events } from "@/types/emitter";
 import { defaultAvatarPath, formatTimestamp } from "@/utils";
 import type { Emitter } from "mitt";
 import { inject, onMounted, ref } from "vue";
@@ -56,7 +56,7 @@ const usersStore = storeUsers();
 const usersPerPage = ref(5);
 const userSearch = ref("");
 
-function disableUser(user: UserItem) {
+function disableUser(user: User) {
   userApi.updateUser(user).catch(({ response, message }) => {
     emitter?.emit("snackbarShow", {
       msg: `Unable to disable/enable user: ${