Skip to content

Ensure the LoadPreferences message is dispatched with None when no preferences exist #3198

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

Merged
merged 2 commits into from
Sep 23, 2025
Merged

Ensure the LoadPreferences message is dispatched with None when no preferences exist #3198

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
c8e6431
preference load message on default load
timon-schelling Sep 23, 2025
fd1c67d
review fixup
timon-schelling Sep 23, 2025
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
7 changes: 3 additions & 4 deletions desktop/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,9 @@ impl App {
self.persistent_data.write_preferences(preferences);
}
DesktopFrontendMessage::PersistenceLoadPreferences => {
if let Some(preferences) = self.persistent_data.load_preferences() {
let message = DesktopWrapperMessage::LoadPreferences { preferences };
self.dispatch_desktop_wrapper_message(message);
}
let preferences = self.persistent_data.load_preferences();
let message = DesktopWrapperMessage::LoadPreferences { preferences };
self.dispatch_desktop_wrapper_message(message);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion desktop/wrapper/src/messages.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ pub enum DesktopWrapperMessage {
id: DocumentId,
},
LoadPreferences {
preferences: Preferences,
preferences: Option<Preferences>,
},
}

Expand Down
2 changes: 1 addition & 1 deletion editor/src/messages/preferences/preferences_message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::messages::prelude::*;
#[derive(PartialEq, Clone, Debug, serde::Serialize, serde::Deserialize)]
pub enum PreferencesMessage {
// Management messages
Load { preferences: PreferencesMessageHandler },
Load { preferences: Option<PreferencesMessageHandler> },
ResetToDefaults,

// Per-preference messages
Expand Down
4 changes: 3 additions & 1 deletion editor/src/messages/preferences/preferences_message_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ impl MessageHandler<PreferencesMessage, ()> for PreferencesMessageHandler {
match message {
// Management messages
PreferencesMessage::Load { preferences } => {
*self = preferences;
if let Some(preferences) = preferences {
*self = preferences;
}

responses.add(PortfolioMessage::EditorPreferences);
responses.add(PortfolioMessage::UpdateVelloPreference);
Expand Down
4 changes: 1 addition & 3 deletions frontend/src/io-managers/persistence.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,7 @@ export function createPersistenceManager(editor: Editor, portfolio: PortfolioSta

async function loadPreferences() {
const preferences = await get<Record<string, unknown>>("preferences", graphiteStore);
if (!preferences) return;

editor.handle.loadPreferences(JSON.stringify(preferences));
editor.handle.loadPreferences(preferences ? JSON.stringify(preferences) : undefined);
}

// FRONTEND MESSAGE SUBSCRIPTIONS
Expand Down
14 changes: 9 additions & 5 deletions frontend/wasm/src/editor_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,14 +421,18 @@ impl EditorHandle {
}

#[wasm_bindgen(js_name = loadPreferences)]
pub fn load_preferences(&self, preferences: String) {
let Ok(preferences) = serde_json::from_str(&preferences) else {
log::error!("Failed to deserialize preferences");
return;
pub fn load_preferences(&self, preferences: Option<String>) {
let preferences = if let Some(preferences) = preferences {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be a .map() instead of if-let-else?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I guess you need to not be in a closure for the early return.

let Ok(preferences) = serde_json::from_str(&preferences) else {
log::error!("Failed to deserialize preferences");
return;
};
Some(preferences)
} else {
None
};

let message = PreferencesMessage::Load { preferences };

self.dispatch(message);
}

Expand Down
Loading