Disallow a fork when a fork is in progress (codesandbox#2834)

* Disallow a fork when a fork is in progress

* Add cancel scenario for withOwnedSandbox

* Cleanup

Author: CompuIves

packages/app/src/app/overmind/factories.ts

@@ -66,11 +66,16 @@ export const withLoadApp = <T>(
 };
 
 export const withOwnedSandbox = <T>(
-  continueAction: AsyncAction<T>
+  continueAction: AsyncAction<T>,
+  cancelAction: AsyncAction<T> = () => Promise.resolve()
 ): AsyncAction<T> => async (context, payload) => {
   const { state, actions } = context;
 
   if (!state.editor.currentSandbox.owned) {
+    if (state.editor.isForkingSandbox) {
+      return cancelAction(context, payload);
+    }
+
     await actions.editor.internal.forkSandbox({
       sandboxId: state.editor.currentId,
     });
@@ -87,11 +92,10 @@ export const withOwnedSandbox = <T>(
     } else if (modalResponse === 'unfreeze') {
       state.editor.sessionFrozen = false;
     } else if (modalResponse === 'cancel') {
-      return;
+      return cancelAction(context, payload);
     }
   }
 
-  // eslint-disable-next-line consistent-return
   return continueAction(context, payload);
 };
 

packages/app/src/app/overmind/namespaces/editor/actions.ts

@@ -152,13 +152,18 @@ export const codeSaved: AsyncAction<{
   code: string;
   moduleShortid: string;
   cbID: string;
-}> = withOwnedSandbox(async ({ actions }, { code, moduleShortid, cbID }) => {
-  actions.editor.internal.saveCode({
-    code,
-    moduleShortid,
-    cbID,
-  });
-});
+}> = withOwnedSandbox(
+  async ({ actions }, { code, moduleShortid, cbID }) => {
+    actions.editor.internal.saveCode({
+      code,
+      moduleShortid,
+      cbID,
+    });
+  },
+  async ({ effects }, { cbID }) => {
+    effects.vscode.callCallbackError(cbID);
+  }
+);
 
 export const codeChanged: Action<{
   code: string;

packages/app/src/app/overmind/namespaces/editor/internalActions.ts

@@ -166,12 +166,15 @@ export const saveCode: AsyncAction<{
     effects.notificationToast.warning(error.message);
 
     if (cbID) {
-      effects.vscode.callCallbackError(cbID);
+      effects.vscode.callCallbackError(cbID, error.message);
     }
   }
 };
 
-export const updateCurrentTemplate: Action = ({ state, effects }) => {
+export const updateCurrentTemplate: AsyncAction = async ({
+  state,
+  effects,
+}) => {
   try {
     const currentTemplate = state.editor.currentSandbox.template;
     const templateDefinition = getTemplateDefinition(currentTemplate);
@@ -201,7 +204,7 @@ export const updateCurrentTemplate: Action = ({ state, effects }) => {
           getTemplateDefinition(newTemplate).isServer
       ) {
         state.editor.currentSandbox.template = newTemplate;
-        effects.api.saveTemplate(state.editor.currentId, newTemplate);
+        await effects.api.saveTemplate(state.editor.currentId, newTemplate);
       }
     }
   } catch (e) {

packages/app/src/app/overmind/namespaces/files/actions.ts

@@ -308,7 +308,7 @@ export const massCreateModules: AsyncAction<{
   cbID?: string;
 }> = withOwnedSandbox(
   async (
-    { state, effects, actions },
+    { state, effects },
     { modules, directories, directoryShortid, cbID }
   ) => {
     const sandboxId = state.editor.currentId;
@@ -337,7 +337,7 @@ export const massCreateModules: AsyncAction<{
       }
     } catch (error) {
       if (cbID) {
-        effects.vscode.callCallbackError(cbID);
+        effects.vscode.callCallbackError(cbID, error.message);
       }
       effects.notificationToast.error('Unable to create new files');
     }