mirror of
https://github.com/usememos/memos.git
synced 2025-11-10 01:10:52 +08:00
fix: preference not being saved (#4980)
Signed-off-by: varsnotwars <varsnotwars@protonmail.com> Co-authored-by: Johnny <yourselfhosted@gmail.com>
This commit is contained in:
parent
1f1add1a48
commit
9f8921d3b9
1 changed files with 8 additions and 3 deletions
|
|
@ -280,6 +280,10 @@ const userStore = (() => {
|
||||||
};
|
};
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
// TODO: refactor initialUserStore as it has temporal coupling
|
||||||
|
// need to make it more clear that the order of the body is important
|
||||||
|
// or it leads to false positives
|
||||||
|
// See: https://github.com/usememos/memos/issues/4978
|
||||||
export const initialUserStore = async () => {
|
export const initialUserStore = async () => {
|
||||||
try {
|
try {
|
||||||
const { user: currentUser } = await authServiceClient.getCurrentSession({});
|
const { user: currentUser } = await authServiceClient.getCurrentSession({});
|
||||||
|
|
@ -293,9 +297,6 @@ export const initialUserStore = async () => {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fetch all user settings
|
|
||||||
await userStore.fetchUserSettings();
|
|
||||||
|
|
||||||
userStore.state.setPartial({
|
userStore.state.setPartial({
|
||||||
currentUser: currentUser.name,
|
currentUser: currentUser.name,
|
||||||
userMapByName: {
|
userMapByName: {
|
||||||
|
|
@ -303,6 +304,10 @@ export const initialUserStore = async () => {
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// must be called after user is set in store
|
||||||
|
await userStore.fetchUserSettings();
|
||||||
|
|
||||||
|
// must be run after fetchUserSettings is called.
|
||||||
// Apply general settings to workspace if available
|
// Apply general settings to workspace if available
|
||||||
const generalSetting = userStore.state.userGeneralSetting;
|
const generalSetting = userStore.state.userGeneralSetting;
|
||||||
if (generalSetting) {
|
if (generalSetting) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue