bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Settings: optionally show alert

Browse source
This commit is contained in:
Alex Gleason 2022-06-22 12:17:35 -05:00
parent 017ee90dfd
commit c1a0b7a6a8
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/soapbox/actions/settings.ts
View file

@ -177,7 +177,7 @@ const getSettings = createSelector([
.mergeDeep(settings); .mergeDeep(settings);
}); });
const changeSettingImmediate = (path: string[], value: any) => const changeSettingImmediate = (path: string[], value: any, showAlert = false) =>
(dispatch: AppDispatch) => { (dispatch: AppDispatch) => {
dispatch({ dispatch({
type: SETTING_CHANGE, type: SETTING_CHANGE,
@ -185,10 +185,10 @@ const changeSettingImmediate = (path: string[], value: any) =>
value, value,
}); });
dispatch(saveSettingsImmediate()); dispatch(saveSettingsImmediate(showAlert));
}; };
const changeSetting = (path: string[], value: any) => const changeSetting = (path: string[], value: any, showAlert = false) =>
(dispatch: AppDispatch) => { (dispatch: AppDispatch) => {
dispatch({ dispatch({
type: SETTING_CHANGE, type: SETTING_CHANGE,
@ -196,10 +196,10 @@ const changeSetting = (path: string[], value: any) =>
value, value,
}); });
return dispatch(saveSettings()); return dispatch(saveSettings(showAlert));
}; };
const saveSettingsImmediate = () => const saveSettingsImmediate = (showAlert = false) =>
(dispatch: AppDispatch, getState: () => RootState) => { (dispatch: AppDispatch, getState: () => RootState) => {
if (!isLoggedIn(getState)) return; if (!isLoggedIn(getState)) return;
@ -215,14 +215,16 @@ const saveSettingsImmediate = () =>
})).then(() => { })).then(() => {
dispatch({ type: SETTING_SAVE }); dispatch({ type: SETTING_SAVE });
dispatch(snackbar.success(messages.saveSuccess)); if (showAlert) {
dispatch(snackbar.success(messages.saveSuccess));
}
}).catch(error => { }).catch(error => {
dispatch(showAlertForError(error)); dispatch(showAlertForError(error));
}); });
}; };
const saveSettings = () => const saveSettings = (showAlert = false) =>
(dispatch: AppDispatch) => dispatch(saveSettingsImmediate()); (dispatch: AppDispatch) => dispatch(saveSettingsImmediate(showAlert));
export { export {
SETTING_CHANGE, SETTING_CHANGE,

1
app/soapbox/features/notifications/components/setting_toggle.tsx
View file

@ -13,7 +13,6 @@ interface ISettingToggle {
settingPath: string[], settingPath: string[],
/** Callback when the setting is toggled. */ /** Callback when the setting is toggled. */
onChange: (settingPath: string[], checked: boolean) => void, onChange: (settingPath: string[], checked: boolean) => void,
} }
/** Stateful toggle to change user settings. */ /** Stateful toggle to change user settings. */

4
app/soapbox/features/preferences/index.tsx
View file

@ -96,11 +96,11 @@ const Preferences = () => {
const settings = useAppSelector((state) => getSettings(state)); const settings = useAppSelector((state) => getSettings(state));
const onSelectChange = (event: React.ChangeEvent<HTMLSelectElement>, path: string[]) => { const onSelectChange = (event: React.ChangeEvent<HTMLSelectElement>, path: string[]) => {
dispatch(changeSetting(path, event.target.value)); dispatch(changeSetting(path, event.target.value, true));
}; };
const onToggleChange = (key: string[], checked: boolean) => { const onToggleChange = (key: string[], checked: boolean) => {
dispatch(changeSetting(key, checked)); dispatch(changeSetting(key, checked, true));
}; };
const displayMediaOptions = React.useMemo(() => ({ const displayMediaOptions = React.useMemo(() => ({