Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(web): correct lang state in settings with meData #1182

Merged
merged 2 commits into from
Oct 21, 2024
Merged

refactor(web): correct lang state in settings with meData #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0358b2e
refactor: use value from meData
airslice Oct 21, 2024
413ee12
refactor: use value directly instead of destructure
airslice Oct 21, 2024
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
6 changes: 3 additions & 3 deletions web/src/beta/features/AccountSetting/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ type UpdatePasswordType = {
};

export default () => {
const { useMeQuery, useUpdatePassword, useDeleteUser, updateLanguage } =
const { useMeQuery, useUpdatePassword, useDeleteUser, useUpdateLanguage } =
useMeFetcher();
const { me: data } = useMeQuery();

Expand Down Expand Up @@ -36,12 +36,12 @@ export default () => {
const handleUpdateUserLanguage = useCallback(
async ({ lang }: { lang: string }) => {
try {
await updateLanguage(lang);
await useUpdateLanguage(lang);
} catch (error) {
console.error("Failed to update language:", error);
}
},
[updateLanguage]
[useUpdateLanguage]
);

return {
Expand Down
15 changes: 4 additions & 11 deletions web/src/beta/features/AccountSetting/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ const AccountSetting: FC = () => {
handleUpdateUserPassword,
handleUpdateUserLanguage
} = useHook();
const { name, email } = meData;

const [currentWorkspace] = useWorkspace();

const { tabs } = useAccountSettingsTabs({
Expand All @@ -48,8 +46,6 @@ const AccountSetting: FC = () => {
value: "ja"
}
];
type LanguageOption = (typeof options)[number]["value"];
const [languageLabel, setLanguageLabel] = useState<LanguageOption>("und");

return (
<SettingBase tabs={tabs} tab={"account"}>
Expand All @@ -59,13 +55,13 @@ const AccountSetting: FC = () => {
<SettingsFields>
<InputField
title={t("Name")}
value={name ? t(name) : ""}
value={meData.name ? t(meData.name) : ""}
appearance="readonly"
disabled
/>
<InputField
title={t("Email address")}
value={email ? t(email) : ""}
value={meData.email ? t(meData.email) : ""}
appearance="readonly"
disabled
/>
Expand All @@ -92,13 +88,10 @@ const AccountSetting: FC = () => {
</PasswordWrapper>
<SelectField
title={t("Language")}
value={languageLabel}
value={meData.lang ?? "und"}
options={options}
onChange={(value) => {
if (typeof value === "string") {
setLanguageLabel(value);
handleUpdateUserLanguage({ lang: value });
}
handleUpdateUserLanguage({ lang: value as string });
}}
/>
</SettingsFields>
Expand Down
5 changes: 2 additions & 3 deletions web/src/services/api/meApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,10 @@ export default () => {
[deleteMeMutation, setNotification, t]
);

const updateLanguage = useCallback(
const useUpdateLanguage = useCallback(
async (lang: string) => {
if (!lang) return;
const { data, errors } = await updateMeMutation({ variables: { lang } });
console.log(data);
if (errors || !data?.updateMe) {
console.log("GraphQL: Failed to update language", errors);
setNotification({
Expand All @@ -104,6 +103,6 @@ export default () => {
useMeQuery,
useUpdatePassword,
useDeleteUser,
updateLanguage
useUpdateLanguage
};
};
Loading