Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion web/src/components/UpdateAccountDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Textarea } from "@/components/ui/textarea";
import { useAuth } from "@/contexts/AuthContext";
import { useInstance } from "@/contexts/InstanceContext";
import { convertFileToBase64 } from "@/helpers/utils";
import useCurrentUser from "@/hooks/useCurrentUser";
Expand All @@ -32,6 +33,7 @@ interface State {
function UpdateAccountDialog({ open, onOpenChange, onSuccess }: Props) {
const t = useTranslate();
const currentUser = useCurrentUser();
const { setCurrentUser } = useAuth();
const { generalSetting: instanceGeneralSetting } = useInstance();
const { mutateAsync: updateUser } = useUpdateUser();
const [state, setState] = useState<State>({
Expand Down Expand Up @@ -128,7 +130,7 @@ function UpdateAccountDialog({ open, onOpenChange, onSuccess }: Props) {
if (!isEqual(currentUser?.description, state.description)) {
updateMask.push("description");
}
await updateUser({
const updatedUser = await updateUser({
user: {
name: currentUser?.name,
username: state.username,
Expand All @@ -139,6 +141,7 @@ function UpdateAccountDialog({ open, onOpenChange, onSuccess }: Props) {
},
updateMask,
});
setCurrentUser(updatedUser);
toast.success(t("message.update-succeed"));
onSuccess?.();
onOpenChange(false);
Expand Down
22 changes: 21 additions & 1 deletion web/src/contexts/AuthContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ interface AuthContextValue extends AuthState {
initialize: () => Promise<void>;
logout: () => Promise<void>;
refetchSettings: () => Promise<void>;
setCurrentUser: (user: User | undefined) => void;
}

const AuthContext = createContext<AuthContextValue | null>(null);
Expand Down Expand Up @@ -154,15 +155,34 @@ export function AuthProvider({ children }: { children: ReactNode }) {
});
}, [fetchUserSettings]);

// Sync the updated user to AuthContext and React Query cache after profile changes
const setCurrentUser = useCallback(
(user: User | undefined) => {
const previousUser = queryClient.getQueryData<User>(userKeys.currentUser());
setState((prev) => ({ ...prev, currentUser: user }));
if (user) {
queryClient.setQueryData(userKeys.currentUser(), user);
queryClient.setQueryData(userKeys.detail(user.name), user);
} else {
queryClient.removeQueries({ queryKey: userKeys.currentUser(), exact: true });
if (previousUser?.name) {
queryClient.removeQueries({ queryKey: userKeys.detail(previousUser.name), exact: true });
}
}
},
[queryClient],
);

// Memoize context value to prevent unnecessary re-renders of consumers
const value = useMemo(
() => ({
...state,
initialize,
logout,
refetchSettings,
setCurrentUser,
}),
[state, initialize, logout, refetchSettings],
[state, initialize, logout, refetchSettings, setCurrentUser],
);

return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>;
Expand Down
Loading