do smooth forking, but restart executor and refresh preview (codesandbox#3170)

christianalfoni · CompuIves · commit 8fc41ff25941 · 2019-12-10T21:03:04.000+01:00
diff --git a/packages/app/src/app/overmind/internalActions.ts b/packages/app/src/app/overmind/internalActions.ts
@@ -261,26 +261,7 @@ export const setCurrentSandbox: AsyncAction<Sandbox> = async (
   state.workspace.project.description = sandbox.description || '';
   state.workspace.project.alias = sandbox.alias || '';
 
-  await effects.executor.initializeExecutor(sandbox);
-
-  [
-    'connect',
-    'disconnect',
-    'sandbox:status',
-    'sandbox:start',
-    'sandbox:stop',
-    'sandbox:error',
-    'sandbox:log',
-    'sandbox:hibernate',
-    'sandbox:update',
-    'sandbox:port',
-    'shell:out',
-    'shell:exit',
-  ].forEach(message => {
-    effects.executor.listen(message, actions.server.onSSEMessage);
-  });
-
-  effects.executor.setupExecutor();
+  actions.server.startContainer(sandbox);
 };
 
 export const updateCurrentSandbox: AsyncAction<Sandbox> = async (
diff --git a/packages/app/src/app/overmind/namespaces/editor/internalActions.ts b/packages/app/src/app/overmind/namespaces/editor/internalActions.ts
@@ -360,6 +360,11 @@ export const forkSandbox: AsyncAction<{
     );
     effects.preview.updateAddressbarUrl();
 
+    if (templateDefinition.isServer) {
+      effects.preview.refresh();
+      actions.server.startContainer(forkedSandbox);
+    }
+
     if (state.workspace.openedWorkspaceItem === 'project-summary') {
       actions.workspace.openDefaultItem();
     }
diff --git a/packages/app/src/app/overmind/namespaces/server/actions.ts b/packages/app/src/app/overmind/namespaces/server/actions.ts
@@ -1,12 +1,13 @@
-import { Action } from 'app/overmind';
+import { ViewTab } from '@codesandbox/common/lib/templates/template';
 import {
-  ServerStatus,
+  Sandbox,
   ServerContainerStatus,
   ServerPort,
+  ServerStatus,
 } from '@codesandbox/common/lib/types';
 import { NotificationStatus } from '@codesandbox/notifications/lib/state';
+import { Action, AsyncAction } from 'app/overmind';
 import { getDevToolsTabPosition } from 'app/overmind/utils/server';
-import { ViewTab } from '@codesandbox/common/lib/templates/template';
 
 export const restartSandbox: Action = ({ effects }) => {
   effects.executor.emit('sandbox:restart');
@@ -222,3 +223,29 @@ export const onBrowserFromPortOpened: Action<{
     });
   }
 };
+
+export const startContainer: AsyncAction<Sandbox> = async (
+  { effects, actions },
+  sandbox
+) => {
+  await effects.executor.initializeExecutor(sandbox);
+
+  [
+    'connect',
+    'disconnect',
+    'sandbox:status',
+    'sandbox:start',
+    'sandbox:stop',
+    'sandbox:error',
+    'sandbox:log',
+    'sandbox:hibernate',
+    'sandbox:update',
+    'sandbox:port',
+    'shell:out',
+    'shell:exit',
+  ].forEach(message => {
+    effects.executor.listen(message, actions.server.onSSEMessage);
+  });
+
+  await effects.executor.setupExecutor();
+};
