Merge branch 'desktop-persist-document-path' into nixpkgs-pr

Author: timon-schelling

desktop/src/persist.rs

@@ -6,14 +6,13 @@ pub(crate) struct PersistentData {
 	current_document: Option<DocumentId>,
 	#[serde(skip)]
 	document_order: Option<Vec<DocumentId>>,
-	preferences: Option<Preferences>,
 }
 
 impl PersistentData {
 	pub(crate) fn write_document(&mut self, id: DocumentId, document: Document) {
 		self.documents.write(id, document);
 		if let Some(order) = &self.document_order {
-			self.documents.force_order(order.clone());
+			self.documents.force_order(order);
 		}
 		self.flush();
 	}
@@ -171,10 +170,10 @@ impl DocumentStore {
 		})
 	}
 
-	fn force_order(&mut self, desired_order: Vec<DocumentId>) {
+	fn force_order(&mut self, desired_order: &Vec<DocumentId>) {
 		let mut ordered_prefix_len = 0;
 		for id in desired_order {
-			if let Some(offset) = self.0[ordered_prefix_len..].iter().position(|meta| meta.id == id) {
+			if let Some(offset) = self.0[ordered_prefix_len..].iter().position(|meta| meta.id == *id) {
 				let found_index = ordered_prefix_len + offset;
 				if found_index != ordered_prefix_len {
 					self.0[ordered_prefix_len..=found_index].rotate_right(1);

desktop/wrapper/src/intercept_frontend_message.rs

@@ -81,7 +81,7 @@ pub(super) fn intercept_frontend_message(dispatcher: &mut DesktopWrapperMessageD
 				id: document_id,
 				document: Document {
 					name: details.name,
-					path: None,
+					path: details.path,
 					content: document,
 					is_saved: details.is_saved,
 				},

editor/src/messages/frontend/utility_types.rs

@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use crate::messages::portfolio::document::utility_types::document_metadata::LayerNodeIdentifier;
 use crate::messages::prelude::*;
 
@@ -10,6 +12,7 @@ pub struct OpenDocument {
 #[derive(PartialEq, Eq, Clone, Debug, serde::Serialize, serde::Deserialize, specta::Type)]
 pub struct DocumentDetails {
 	pub name: String,
+	pub path: Option<PathBuf>,
 	#[serde(rename = "isSaved")]
 	pub is_saved: bool,
 	#[serde(rename = "isAutoSaved")]

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -1047,6 +1047,8 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
 			DocumentMessage::SavedDocument { path } => {
 				self.path = path;
 
+				responses.add(PortfolioMessage::AutoSaveActiveDocument);
+
 				// Update the name to match the file stem
 				let document_name_from_path = self.path.as_ref().and_then(|path| {
 					if path.extension().is_some_and(|e| e == FILE_EXTENSION) {

editor/src/messages/portfolio/portfolio_message_handler.rs

@@ -194,6 +194,7 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageContext<'_>> for Portfolio
 					document: document.serialize_document(),
 					details: DocumentDetails {
 						name: document.name.clone(),
+						path: document.path.clone(),
 						is_saved: document.is_saved(),
 						is_auto_saved: document.is_auto_saved(),
 					},
@@ -1052,9 +1053,10 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageContext<'_>> for Portfolio
 						self.documents.get(id).map(|document| OpenDocument {
 							id: *id,
 							details: DocumentDetails {
-								is_auto_saved: document.is_auto_saved(),
-								is_saved: document.is_saved(),
 								name: document.name.clone(),
+								path: document.path.clone(),
+								is_saved: document.is_saved(),
+								is_auto_saved: document.is_auto_saved(),
 							},
 						})
 					})