Fix: update file metadata when saving cloud project triggers new comm…

…it (#6074)
4ian · Dec 13, 2023 · ac82be8 · ac82be8
1 parent 2c92ae4
commit ac82be8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/newIDE/app/src/MainFrame/index.js b/newIDE/app/src/MainFrame/index.js
@@ -2638,17 +2638,21 @@ const MainFrame = (props: Props) => {
   const onChangeProjectName = async (newName: string): Promise<void> => {
     if (!currentProject || !currentFileMetadata) return;
     const storageProviderOperations = getStorageProviderOperations();
+    let newFileMetadata = { ...currentFileMetadata, name: newName };
     if (storageProviderOperations.onChangeProjectProperty) {
-      const wasSaved = await storageProviderOperations.onChangeProjectProperty(
+      const fileMetadataNewAttributes = await storageProviderOperations.onChangeProjectProperty(
         currentProject,
         currentFileMetadata,
         { name: newName }
       );
-      if (wasSaved) unsavedChanges.sealUnsavedChanges();
+      if (fileMetadataNewAttributes) {
+        unsavedChanges.sealUnsavedChanges();
+        newFileMetadata = { ...newFileMetadata, ...fileMetadataNewAttributes };
+      }
     }
     await setState(state => ({
       ...state,
-      currentFileMetadata: { ...currentFileMetadata, name: newName },
+      currentFileMetadata: newFileMetadata,
     }));
   };
 

diff --git a/newIDE/app/src/ProjectsStorage/CloudStorageProvider/CloudProjectWriter.js b/newIDE/app/src/ProjectsStorage/CloudStorageProvider/CloudProjectWriter.js
@@ -121,8 +121,8 @@ export const generateOnChangeProjectProperty = (
   project: gdProject,
   fileMetadata: FileMetadata,
   properties: {| name?: string, gameId?: string |}
-): Promise<boolean> => {
-  if (!authenticatedUser.authenticated) return false;
+): Promise<null | {| version: string |}> => {
+  if (!authenticatedUser.authenticated) return null;
   try {
     await updateCloudProject(
       authenticatedUser,
@@ -138,14 +138,14 @@ export const generateOnChangeProjectProperty = (
       throw new Error("Couldn't save project following property update.");
     }
 
-    return true;
+    return { version: newVersion };
   } catch (error) {
     // TODO: Determine if a feedback should be given to user so that they can try again if necessary.
     console.warn(
       'An error occurred while changing cloud project name. Ignoring.',
       error
     );
-    return false;
+    return null;
   }
 };
 

diff --git a/newIDE/app/src/ProjectsStorage/index.js b/newIDE/app/src/ProjectsStorage/index.js
@@ -146,7 +146,7 @@ export type StorageProviderOperations = {|
     project: gdProject,
     fileMetadata: FileMetadata,
     properties: {| name?: string, gameId?: string |} // In order to synchronize project and cloud project names.
-  ) => Promise<boolean>,
+  ) => Promise<null | {| version: string |}>,
 
   // Project auto saving:
   onAutoSaveProject?: (