feat: #333 load language from backend configuration (#377)

* feat: #333 load language from backend configuration

* feat(settings): sync language with user configs api

* Update __test__/features/Settings/SettingsPage.test.tsx

Co-authored-by: Lê Nhân Phụng <lenhanphung@Phung-Mac-M4.local>
Co-authored-by: Benoit TELLIER <btellier@linagora.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
This commit is contained in:
lenhanphung
2025-12-02 16:06:11 +07:00
committed by GitHub
parent 541a681e17
commit c408e1818f
7 changed files with 364 additions and 51 deletions
+20 -2
View File
@@ -13,6 +13,7 @@ import { useAppDispatch, useAppSelector } from "./app/hooks";
import { push } from "redux-first-history";
import { ErrorSnackbar } from "./components/Error/ErrorSnackbar";
import I18n from "cozy-ui/transpiled/react/providers/I18n";
import { AVAILABLE_LANGUAGES } from "./features/Settings/constants";
import {
enGB,
@@ -29,16 +30,33 @@ import vi from "./locales/vi.json";
const locale = { en, fr, ru, vi };
const dateLocales = { en: enGB, fr: frLocale, ru: ruLocale, vi: viLocale };
const SUPPORTED_LANGUAGES = AVAILABLE_LANGUAGES.map((lang) => lang.code);
type SupportedLanguage = (typeof SUPPORTED_LANGUAGES)[number];
const isValidLanguage = (
lang: string | null | undefined
): lang is SupportedLanguage => {
return !!lang && SUPPORTED_LANGUAGES.includes(lang as SupportedLanguage);
};
function App() {
const error = useAppSelector((state) => state.user.error);
const lang = useAppSelector((state) => state.settings.language);
const userLanguage = useAppSelector((state) => state.user.language);
const settingsLanguage = useAppSelector((state) => state.settings.language);
const savedLang = localStorage.getItem("lang");
const defaultLang = (window as any).LANG;
const lang =
[userLanguage, settingsLanguage, savedLang, defaultLang].find(
(l): l is string => isValidLanguage(l)
) || "en";
const dispatch = useAppDispatch();
useEffect(() => {
if (error) {
dispatch(push("/error"));
}
});
}, [error, dispatch]);
return (
<CustomThemeProvider>
+41 -4
View File
@@ -12,12 +12,17 @@ import {
Select,
MenuItem,
Typography,
Snackbar,
} from "@mui/material";
import ArrowBackIcon from "@mui/icons-material/ArrowBack";
import SettingsIcon from "@mui/icons-material/Settings";
import SyncIcon from "@mui/icons-material/Sync";
import { useAppDispatch, useAppSelector } from "../../app/hooks";
import { setView, setLanguage } from "./SettingsSlice";
import { setView, setLanguage as setSettingsLanguage } from "./SettingsSlice";
import {
updateUserConfigurationsAsync,
setLanguage as setUserLanguage,
} from "../User/userSlice";
import { AVAILABLE_LANGUAGES } from "./constants";
import { useI18n } from "cozy-ui/transpiled/react/providers/I18n";
import "./SettingsPage.styl";
@@ -27,11 +32,15 @@ type SettingsSubTab = "settings" | "notifications";
export default function SettingsPage() {
const dispatch = useAppDispatch();
const { t, lang } = useI18n();
const { t } = useI18n();
const userLanguage = useAppSelector((state) => state.user?.language);
const settingsLanguage = useAppSelector((state) => state.settings?.language);
const currentLanguage = userLanguage || settingsLanguage || "en";
const [activeNavItem, setActiveNavItem] =
useState<SidebarNavItem>("settings");
const [activeSettingsSubTab, setActiveSettingsSubTab] =
useState<SettingsSubTab>("settings");
const [languageErrorOpen, setLanguageErrorOpen] = useState(false);
const handleBackClick = () => {
dispatch(setView("calendar"));
@@ -52,7 +61,27 @@ export default function SettingsPage() {
};
const handleLanguageChange = (event: any) => {
dispatch(setLanguage(event.target.value));
const newLanguage = event.target.value;
const previousLanguage = currentLanguage;
// Optimistic update - update UI immediately
dispatch(setUserLanguage(newLanguage));
dispatch(setSettingsLanguage(newLanguage));
// Call API in background, don't wait for it
dispatch(updateUserConfigurationsAsync({ language: newLanguage }))
.unwrap()
.catch((error) => {
console.error("Failed to update language:", error);
// Rollback on error
dispatch(setUserLanguage(previousLanguage));
dispatch(setSettingsLanguage(previousLanguage));
setLanguageErrorOpen(true);
});
};
const handleLanguageErrorClose = () => {
setLanguageErrorOpen(false);
};
return (
@@ -122,7 +151,7 @@ export default function SettingsPage() {
</Typography>
<FormControl size="small" sx={{ minWidth: 500 }}>
<Select
value={lang}
value={currentLanguage}
onChange={handleLanguageChange}
variant="outlined"
aria-label={
@@ -157,6 +186,14 @@ export default function SettingsPage() {
)}
</Box>
</Box>
<Snackbar
open={languageErrorOpen}
autoHideDuration={4000}
onClose={handleLanguageErrorClose}
message={
t("settings.languageUpdateError") || "Failed to update language"
}
/>
</main>
);
}
+35
View File
@@ -33,3 +33,38 @@ export async function getUserDetails(id: string) {
const user = await api.get(`api/users/${id}`).json();
return user;
}
export interface UserConfigurationUpdates {
language?: string;
notifications?: Record<string, unknown>;
timezone?: string;
}
export async function updateUserConfigurations(
updates: UserConfigurationUpdates
): Promise<Response | { status: number }> {
const coreConfigs: Array<{ name: string; value: any }> = [];
if (updates.language !== undefined) {
coreConfigs.push({ name: "language", value: updates.language });
}
if (updates.notifications !== undefined) {
coreConfigs.push({ name: "notifications", value: updates.notifications });
}
if (updates.timezone !== undefined) {
coreConfigs.push({ name: "timezone", value: updates.timezone });
}
if (coreConfigs.length === 0) {
return Promise.resolve({ status: 204 });
}
return await api.patch(`api/configurations?scope=user`, {
json: [
{
name: "core",
configurations: coreConfigs,
},
],
});
}
+20
View File
@@ -6,8 +6,28 @@ export interface userData {
sid: string;
sub: string;
openpaasId?: string;
language?: string;
}
export interface UserConfigurations {
modules?: Array<{
name: string;
configurations?: Array<{
name: string;
value: any;
}>;
}>;
}
export interface NotificationSettings {
email?: boolean;
push?: boolean;
}
export type NotificationSettingsExtended = NotificationSettings & {
[key: string]: unknown;
};
export interface userOrganiser {
cn: string;
cal_address: string;
+62 -4
View File
@@ -1,15 +1,19 @@
import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
import { userData, userOrganiser } from "./userDataTypes";
import { getOpenPaasUser } from "./userAPI";
import {
getOpenPaasUser,
updateUserConfigurations,
UserConfigurationUpdates,
} from "./userAPI";
import { formatReduxError } from "../../utils/errorUtils";
export const getOpenPaasUserDataAsync = createAsyncThunk<
Record<string, string>,
Record<string, any>,
void,
{ rejectValue: { message: string; status?: number } }
>("user/getOpenPaasUserData", async (_, { rejectWithValue }) => {
try {
const user = (await getOpenPaasUser()) as Record<string, string>;
const user = (await getOpenPaasUser()) as Record<string, any>;
return user;
} catch (err: any) {
return rejectWithValue({
@@ -19,12 +23,29 @@ export const getOpenPaasUserDataAsync = createAsyncThunk<
}
});
export const updateUserConfigurationsAsync = createAsyncThunk<
UserConfigurationUpdates,
UserConfigurationUpdates,
{ rejectValue: { message: string; status?: number } }
>("user/updateConfigurations", async (updates, { rejectWithValue }) => {
try {
await updateUserConfigurations(updates);
return updates;
} catch (err: any) {
return rejectWithValue({
message: formatReduxError(err),
status: err.response?.status,
});
}
});
export const userSlice = createSlice({
name: "user",
initialState: {
userData: null as unknown as userData,
organiserData: null as unknown as userOrganiser,
tokens: null as unknown as Record<string, string>,
language: null as string | null,
loading: true,
error: null as unknown as string | null,
},
@@ -41,6 +62,12 @@ export const userSlice = createSlice({
setTokens: (state, action) => {
state.tokens = action.payload;
},
setLanguage: (state, action) => {
state.language = action.payload;
if (state.userData) {
state.userData.language = action.payload;
}
},
clearError: (state) => {
state.error = null;
},
@@ -62,6 +89,22 @@ export const userSlice = createSlice({
state.organiserData.cal_address = action.payload.preferredEmail;
state.userData.email = action.payload.preferredEmail;
}
// Extract language from configurations.modules
if (action.payload.configurations?.modules) {
const coreModule = action.payload.configurations.modules.find(
(module: any) => module.name === "core"
);
if (coreModule?.configurations) {
const languageConfig = coreModule.configurations.find(
(config: any) => config.name === "language"
);
if (languageConfig?.value) {
state.language = languageConfig.value;
state.userData.language = languageConfig.value;
}
}
}
})
.addCase(getOpenPaasUserDataAsync.pending, (state) => {
state.loading = true;
@@ -72,11 +115,26 @@ export const userSlice = createSlice({
state.error =
action.payload?.message || "Failed to fetch user information";
}
})
.addCase(updateUserConfigurationsAsync.fulfilled, (state, action) => {
if (action.payload.language !== undefined) {
state.language = action.payload.language;
if (state.userData) {
state.userData.language = action.payload.language;
}
}
})
.addCase(updateUserConfigurationsAsync.rejected, (state, action) => {
if (action.payload?.status !== 401) {
state.error =
action.payload?.message || "Failed to update user configurations";
}
});
},
});
// Action creators are generated for each case reducer function
export const { setUserData, setTokens, clearError } = userSlice.actions;
export const { setUserData, setTokens, setLanguage, clearError } =
userSlice.actions;
export default userSlice.reducer;