From 3222572d075054ea3a81948ad04f6928664c4a7b Mon Sep 17 00:00:00 2001 From: Uriel-Sautron Date: Wed, 5 Feb 2025 09:42:57 +0100 Subject: [PATCH] fix: fix Clara comments --- front/src/common/UserSettings.tsx | 6 +++--- front/src/reducers/user/index.ts | 6 +++--- front/src/reducers/user/userSelectors.ts | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/front/src/common/UserSettings.tsx b/front/src/common/UserSettings.tsx index 4c8d4c72bce..025866bd593 100644 --- a/front/src/common/UserSettings.tsx +++ b/front/src/common/UserSettings.tsx @@ -61,17 +61,17 @@ const UserSettings = () => { { // TODO PACEDTRAIN: Remove switch after development pacedTrain feature isSuperUser && ( -
+
dispatch( updateUserPreferences({ ...userPreferences, - pacedTrain: !userPreferences.pacedTrain, + showPacedTrains: !userPreferences.showPacedTrains, }) ) } diff --git a/front/src/reducers/user/index.ts b/front/src/reducers/user/index.ts index f1614a073cf..0ad83a5e172 100644 --- a/front/src/reducers/user/index.ts +++ b/front/src/reducers/user/index.ts @@ -8,7 +8,7 @@ export interface UserState { loginError?: ApiError; username: string; // TODO PACEDTRAIN: Remove pacedTrain after development pacedTrain feature - userPreferences: { safeWord: string; pacedTrain?: boolean }; + userPreferences: { safeWord: string; showPacedTrains?: boolean }; userRoles: BuiltinRole[]; account: Record; } @@ -18,7 +18,7 @@ export const userInitialState: UserState = { loginError: undefined, username: '', // TODO PACEDTRAIN: Remove pacedTrain after development pacedTrain feature - userPreferences: { safeWord: '', pacedTrain: false }, + userPreferences: { safeWord: '', showPacedTrains: false }, userRoles: [], account: {}, }; @@ -50,7 +50,7 @@ export const userSlice = createSlice({ updateUserPreferences( state, // TODO PACEDTRAIN: Remove pacedTrain after development pacedTrain feature - action: PayloadAction<{ safeWord: string; pacedTrain?: boolean }> + action: PayloadAction<{ safeWord: string; showPacedTrains?: boolean }> ) { state.userPreferences = action.payload; }, diff --git a/front/src/reducers/user/userSelectors.ts b/front/src/reducers/user/userSelectors.ts index 1efb786c121..2df3a6ec90b 100644 --- a/front/src/reducers/user/userSelectors.ts +++ b/front/src/reducers/user/userSelectors.ts @@ -16,6 +16,9 @@ export const getUsername = makeUserSelector('username'); export const getUserRoles = makeUserSelector('userRoles'); export const getIsSuperUser = (state: RootState) => getUserRoles(state).includes('Superuser'); +// TODO PACEDTRAIN: Remove pacedTrain after development pacedTrain feature +export const getShowPacedTrains = makeUserPreferencesSelector('showPacedTrains'); + const makeUserHasAllRequiredRolesSelector = (requiredRoles: BuiltinRole[]) => (state: RootState) => { const userRoles = getUserRoles(state);