Fix smooth fork initial file selection on live

Author: christianalfoni

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

@@ -12,7 +12,6 @@ import {
 import { NotificationStatus } from '@codesandbox/notifications';
 
 import { createOptimisticModule } from './utils/common';
-import getItems from './utils/items';
 import { defaultOpenedModule, mainModule } from './utils/main-module';
 import { parseConfigurations } from './utils/parse-configurations';
 import { Action, AsyncAction } from '.';
@@ -260,11 +259,6 @@ export const setCurrentSandbox: AsyncAction<Sandbox> = async (
   state.workspace.project.description = sandbox.description || '';
   state.workspace.project.alias = sandbox.alias || '';
 
-  const items = getItems(state);
-  const defaultItem = items.find(i => i.defaultOpen) || items[0];
-
-  state.workspace.openedWorkspaceItem = defaultItem.id;
-
   await effects.executor.initializeExecutor(sandbox);
 
   [

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

@@ -10,6 +10,7 @@ import {
 import { Action, AsyncAction } from 'app/overmind';
 import { withLoadApp, withOwnedSandbox } from 'app/overmind/factories';
 import { sortObjectByKeys } from 'app/overmind/utils/common';
+import getItems from 'app/overmind/utils/items';
 import {
   addDevToolsTab as addDevToolsTabUtil,
   closeDevToolsTab as closeDevToolsTabUtil,
@@ -101,6 +102,11 @@ export const sandboxChanged: AsyncAction<{ id: string }> = withLoadApp<{
     await effects.vscode.closeAllTabs();
 
     actions.internal.setCurrentSandbox(sandbox);
+
+    const items = getItems(state);
+    const defaultItem = items.find(i => i.defaultOpen) || items[0];
+
+    state.workspace.openedWorkspaceItem = defaultItem.id;
   } catch (error) {
     state.editor.notFound = true;
     state.editor.error = error.message;

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

@@ -1,6 +1,7 @@
 import { LiveMessage, LiveMessageEvent } from '@codesandbox/common/lib/types';
 import { Action, AsyncAction, Operator } from 'app/overmind';
 import { withLoadApp } from 'app/overmind/factories';
+import getItems from 'app/overmind/utils/items';
 import { filter, fork, pipe } from 'overmind';
 
 import * as internalActions from './internalActions';
@@ -19,10 +20,21 @@ export const roomJoined: AsyncAction<{
     state.currentModal = modal;
   }
 
-  actions.internal.setCurrentSandbox(sandbox);
-  state.editor.modulesByPath = effects.vscode.fs.create(sandbox);
+  await effects.vscode.closeAllTabs();
+  await actions.internal.setCurrentSandbox(sandbox);
+
+  const items = getItems(state);
+  const defaultItem = items.find(i => i.defaultOpen) || items[0];
+
+  state.workspace.openedWorkspaceItem = defaultItem.id;
+
+  state.editor.modulesByPath = effects.vscode.fs.create(
+    state.editor.currentSandbox
+  );
+
   await effects.vscode.changeSandbox(sandbox);
   effects.vscode.openModule(state.editor.currentModule);
+  effects.preview.executeCodeImmediately(true);
   state.live.isLoading = false;
 });
 
@@ -31,8 +43,19 @@ export const createLiveClicked: AsyncAction<{
 }> = async ({ state, effects, actions }, { sandboxId }) => {
   effects.analytics.track('Create Live Session');
 
+  await effects.vscode.closeAllTabs();
+
   const roomId = await effects.api.createLiveRoom(sandboxId);
-  await actions.live.internal.initialize(roomId);
+  const sandbox = await actions.live.internal.initialize(roomId);
+  actions.internal.setCurrentSandbox(sandbox);
+
+  state.editor.modulesByPath = effects.vscode.fs.create(
+    state.editor.currentSandbox
+  );
+
+  await effects.vscode.changeSandbox(sandbox);
+  effects.vscode.openModule(state.editor.currentModule);
+  effects.preview.executeCodeImmediately(true);
 };
 
 export const liveMessageReceived: Operator<LiveMessage> = pipe(

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

@@ -72,16 +72,6 @@ export const initialize: AsyncAction<string, Sandbox> = async (
     }
     state.editor.currentId = sandbox.id;
 
-    await effects.vscode.closeAllTabs();
-
-    state.editor.modulesByPath = effects.vscode.fs.create(
-      state.editor.currentSandbox
-    );
-
-    await effects.vscode.changeSandbox(sandbox);
-    effects.vscode.openModule(state.editor.currentModule);
-    effects.preview.executeCodeImmediately(true);
-
     effects.analytics.track('Live Session Joined', {});
     effects.live.listen(actions.live.liveMessageReceived);