aykhans/slash-e
1
0
Fork 0
mirror of https://github.com/aykhans/slash-e.git synced 2025-04-20 14:01:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: update user fields

Browse Source
This commit is contained in:
Steven 2024-07-23 22:18:49 +08:00
parent b1051418c6
commit 6920313b77
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/web/src/components/ChangePasswordDialog.tsx
View File

@ -46,10 +46,13 @@ const ChangePasswordDialog: React.FC<Props> = (props: Props) => {
requestState.setLoading();
try {
userStore.patchUser({
id: userStore.getCurrentUser().id,
password: newPassword,
});
userStore.patchUser(
{
id: userStore.getCurrentUser().id,
password: newPassword,
},
["password"],
);
onClose();
toast("Password changed");
} catch (error: any) {

6
frontend/web/src/components/CreateUserDialog.tsx
View File

@ -97,16 +97,20 @@ const CreateUserDialog: React.FC<Props> = (props: Props) => {
const userPatch: Partial<User> = {
id: user.id,
};
const updateMask: string[] = [];
if (user.email !== state.userCreate.email) {
userPatch.email = state.userCreate.email;
updateMask.push("email");
}
if (user.nickname !== state.userCreate.nickname) {
userPatch.nickname = state.userCreate.nickname;
updateMask.push("nickname");
}
if (user.role !== state.userCreate.role) {
userPatch.role = state.userCreate.role;
updateMask.push("role");
}
await userStore.patchUser(userPatch);
await userStore.patchUser(userPatch, updateMask);
} else {
await userStore.createUser(state.userCreate);
}

13
frontend/web/src/components/EditUserinfoDialog.tsx
View File

@ -41,11 +41,14 @@ const EditUserinfoDialog: React.FC<Props> = (props: Props) => {
requestState.setLoading();
try {
await userStore.patchUser({
id: currentUser.id,
email,
nickname,
});
await userStore.patchUser(
{
id: currentUser.id,
email,
nickname,
},
["email", "nickname"],
);
onClose();
toast("User information updated");
} catch (error: any) {

6
frontend/web/src/stores/user.ts
View File

@ -16,7 +16,7 @@ interface UserState {
getCurrentUser: () => User;
setCurrentUserId: (id: number) => void;
createUser: (create: Partial<User>) => Promise<User>;
patchUser: (userPatch: Partial<User>) => Promise<void>;
patchUser: (userPatch: Partial<User>, updateMask: string[]) => Promise<void>;
deleteUser: (id: number) => Promise<void>;
// User setting related actions.
@ -75,10 +75,10 @@ const useUserStore = create<UserState>()((set, get) => ({
set(userMap);
return user;
},
patchUser: async (userPatch: Partial<User>) => {
patchUser: async (userPatch: Partial<User>, updateMask: string[]) => {
const { user } = await userServiceClient.updateUser({
user: userPatch,
updateMask: ["email", "nickname"],
updateMask: updateMask,
});
if (!user) {
throw new Error("User not found");