Add "Reload Project" menu action (#8501)

Co-authored-by: Gleb Volkov <glebusheg@playtika.com>

Author: 4ian

newIDE/app/src/CommandPalette/CommandsList.js

@@ -17,6 +17,7 @@ export type CommandName =
   | 'SAVE_PROJECT'
   | 'SAVE_PROJECT_AS'
   | 'CLOSE_PROJECT'
+  | 'RELOAD_PROJECT'
   | 'EXPORT_GAME'
   | 'INVITE_COLLABORATORS'
   | 'OPEN_RECENT_PROJECT'
@@ -151,6 +152,10 @@ const commandsList: { [CommandName]: CommandMetadata } = {
     displayText: t`Close project`,
     handledByElectron: true,
   },
+  RELOAD_PROJECT: {
+    area: 'GENERAL',
+    displayText: t`Reload project from disk/cloud (lose all changes)`,
+  },
   EXPORT_GAME: {
     area: 'PROJECT',
     displayText: t`Export game`,

newIDE/app/src/KeyboardShortcuts/DefaultShortcuts.js

@@ -17,6 +17,7 @@ const defaultShortcuts: ShortcutMap = {
   SAVE_PROJECT: 'CmdOrCtrl+KeyS',
   SAVE_PROJECT_AS: 'CmdOrCtrl+Shift+KeyS',
   CLOSE_PROJECT: 'CmdOrCtrl+KeyW',
+  RELOAD_PROJECT: '',
   EXPORT_GAME: 'CmdOrCtrl+Shift+KeyE',
   INVITE_COLLABORATORS: 'CmdOrCtrl+Shift+KeyI',
   OPEN_RECENT_PROJECT: '',

newIDE/app/src/MainFrame/MainFrameCommands.js

@@ -58,6 +58,7 @@ type CommandHandlers = {|
   onSaveProjectAs: () => void,
   onCloseApp: () => void,
   onCloseProject: () => Promise<void>,
+  onReloadProject: () => Promise<void>,
   onExportGame: () => void,
   onInviteCollaborators: () => void,
   onOpenLayout: string => void,
@@ -150,6 +151,10 @@ const useMainFrameCommands = (handlers: CommandHandlers) => {
     handler: handlers.onCloseProject,
   });
 
+  useCommand('RELOAD_PROJECT', !!handlers.project, {
+    handler: handlers.onReloadProject,
+  });
+
   useCommand('EXPORT_GAME', !!handlers.project, {
     handler: handlers.onExportGame,
   });

newIDE/app/src/MainFrame/index.js

@@ -1176,14 +1176,14 @@ const MainFrame = (props: Props): React.MixedElement => {
 
         // Read and apply project settings from gdevelop-settings.yaml if it exists
         try {
-          const rawSettings = await readProjectSettings(
+          const parsedProjectSettings = await readProjectSettings(
             updatedFileMetadata.fileIdentifier
           );
-          if (rawSettings) {
-            applyProjectPreferences(rawSettings.preferences, preferences);
+          if (parsedProjectSettings) {
+            applyProjectPreferences(parsedProjectSettings, preferences);
             setState(currentState => ({
               ...currentState,
-              toolbarButtons: rawSettings.toolbarButtons || [],
+              toolbarButtons: parsedProjectSettings.toolbarButtons || [],
             }));
           }
         } catch (error) {
@@ -4311,6 +4311,41 @@ const MainFrame = (props: Props): React.MixedElement => {
     [currentProject, hasUnsavedChanges, i18n, closeProject]
   );
 
+  const reloadProject = React.useCallback(
+    async (): Promise<void> => {
+      if (!currentProject || !currentFileMetadata) return;
+
+      if (hasUnsavedChanges) {
+        const answer = Window.showConfirmDialog(
+          i18n._(
+            t`Reload the project? Any changes that have not been saved will be lost.`
+          )
+        );
+        if (!answer) return;
+      }
+
+      const storageProviderName = getStorageProvider().internalName;
+      await openFromFileMetadataWithStorageProvider(
+        {
+          fileMetadata: currentFileMetadata,
+          storageProviderName,
+        },
+        {
+          ignoreUnsavedChanges: true,
+          ignoreAutoSave: true,
+        }
+      );
+    },
+    [
+      currentProject,
+      currentFileMetadata,
+      hasUnsavedChanges,
+      i18n,
+      getStorageProvider,
+      openFromFileMetadataWithStorageProvider,
+    ]
+  );
+
   const endTutorial = React.useCallback(
     async (shouldCloseProject?: boolean) => {
       if (shouldCloseProject) {
@@ -4805,6 +4840,7 @@ const MainFrame = (props: Props): React.MixedElement => {
     onCloseProject: async () => {
       askToCloseProject();
     },
+    onReloadProject: reloadProject,
     onExportGame: () => {
       openShareDialog('publish');
     },

newIDE/app/src/Utils/ApplyProjectPreferences.js

@@ -3,6 +3,8 @@ import {
   type Preferences,
   type ProjectSpecificPreferencesValues,
 } from '../MainFrame/Preferences/PreferencesContext';
+import { type CommandName } from '../CommandPalette/CommandsList';
+import { type ParsedProjectSettings } from './ProjectSettingsReader';
 
 /** Allowlist of preference keys that can be overridden per-project. */
 const allowedPreferenceKeys: $ReadOnlyArray<
@@ -85,12 +87,13 @@ const normalizeDeprecatedInstructionWarning = (
 };
 
 /**
- * Applies project-specific preferences from a gdevelop-settings.yaml file to the editor.
+ * Applies project-specific preferences and shortcuts from a gdevelop-settings.yaml file to the editor.
  */
 export const applyProjectPreferences = (
-  rawPreferences: ?{ [string]: boolean | string | number },
+  parsedProjectSettings: ParsedProjectSettings,
   preferences: Preferences
 ): void => {
+  const rawPreferences = parsedProjectSettings.preferences;
   if (rawPreferences) {
     const filtered = filterAllowedPreferences(rawPreferences);
     if (
@@ -106,4 +109,13 @@ export const applyProjectPreferences = (
     }
     preferences.setMultipleValues(filtered);
   }
+
+  if (parsedProjectSettings.shortcuts) {
+    const shortcuts = parsedProjectSettings.shortcuts;
+    for (const key of Object.keys(shortcuts)) {
+      // $FlowFixMe[incompatible-call]
+      const commandName: CommandName = (key: any);
+      preferences.setShortcutForCommand(commandName, shortcuts[key]);
+    }
+  }
 };

newIDE/app/src/Utils/ProjectSettingsReader.js

@@ -11,6 +11,7 @@ const path = optionalRequire('path');
 export type ParsedProjectSettings = {
   preferences?: { [string]: boolean | string | number },
   toolbarButtons?: Array<ToolbarButtonConfig>,
+  shortcuts?: { [string]: string },
 };
 
 const SETTINGS_FILE_NAME = 'gdevelop-settings.yaml';
@@ -126,10 +127,27 @@ export const readProjectSettings = async (
       }
     }
 
+    // Parse shortcuts section
+    const rawShortcuts = SafeExtractor.extractObjectProperty(
+      parsed,
+      'shortcuts'
+    );
+    const shortcuts: { [string]: string } = {};
+    if (rawShortcuts) {
+      for (const key of Object.keys(rawShortcuts)) {
+        const value = SafeExtractor.extractStringProperty(rawShortcuts, key);
+        if (value !== null) {
+          shortcuts[key] = value;
+        }
+      }
+    }
+
     console.info(
       `[ProjectSettingsReader] Loaded: ${
         Object.keys(preferences).length
-      } preferences, ${toolbarButtons.length} buttons`
+      } preferences, ${toolbarButtons.length} buttons, ${
+        Object.keys(shortcuts).length
+      } shortcuts`
     );
 
     const result: ParsedProjectSettings = {};
@@ -139,6 +157,9 @@ export const readProjectSettings = async (
     if (toolbarButtons.length > 0) {
       result.toolbarButtons = toolbarButtons;
     }
+    if (Object.keys(shortcuts).length > 0) {
+      result.shortcuts = shortcuts;
+    }
     return result;
   } catch (error) {
     console.error(

newIDE/app/src/Utils/ProjectSettingsReader.spec.js

@@ -76,14 +76,17 @@ preferences:
       // Step 4: Apply to preferences via setMultipleValues
       // $FlowFixMe[underconstrained-implicit-instantiation]
       const mockSetMultipleValues = jest.fn();
+      // $FlowFixMe[underconstrained-implicit-instantiation]
+      const mockSetShortcutForCommand = jest.fn();
       // $FlowFixMe[incompatible-type] - partial mock
       const mockPreferences: Preferences = {
         // $FlowFixMe[incompatible-type] - partial mock
         values: {},
         setMultipleValues: mockSetMultipleValues,
+        setShortcutForCommand: mockSetShortcutForCommand,
       };
 
-      applyProjectPreferences(rawPreferences, mockPreferences);
+      applyProjectPreferences({ preferences: rawPreferences }, mockPreferences);
 
       expect(mockSetMultipleValues).toHaveBeenCalledWith({
         autosaveOnPreview: true,
@@ -99,6 +102,41 @@ preferences:
       });
     });
 
+    test('shortcuts from gdevelop-settings.yaml are properly applied to preferences', () => {
+      // $FlowFixMe[underconstrained-implicit-instantiation]
+      const mockSetMultipleValues = jest.fn();
+      // $FlowFixMe[underconstrained-implicit-instantiation]
+      const mockSetShortcutForCommand = jest.fn();
+      // $FlowFixMe[incompatible-type] - partial mock
+      const mockPreferences: Preferences = {
+        // $FlowFixMe[incompatible-type] - partial mock
+        values: {},
+        setMultipleValues: mockSetMultipleValues,
+        setShortcutForCommand: mockSetShortcutForCommand,
+      };
+
+      applyProjectPreferences(
+        {
+          shortcuts: {
+            RELOAD_PROJECT: 'CmdOrCtrl+Shift+R',
+            OPEN_PROJECT_PROPERTIES: 'CmdOrCtrl+Shift+P',
+          },
+        },
+        mockPreferences
+      );
+
+      expect(mockSetShortcutForCommand).toHaveBeenCalledTimes(2);
+      expect(mockSetShortcutForCommand).toHaveBeenCalledWith(
+        'RELOAD_PROJECT',
+        'CmdOrCtrl+Shift+R'
+      );
+      expect(mockSetShortcutForCommand).toHaveBeenCalledWith(
+        'OPEN_PROJECT_PROPERTIES',
+        'CmdOrCtrl+Shift+P'
+      );
+      expect(mockSetMultipleValues).not.toHaveBeenCalled();
+    });
+
     test('readProjectSettings would return null when preferences section is missing', () => {
       const yamlContent = `
 # Project settings without preferences