use sandbox.id instead of currentId

Author: christianalfoni

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

@@ -216,9 +216,8 @@ export const refetchSandboxInfo: AsyncAction = async ({
   actions,
 }) => {
   if (state.editor.currentId) {
-    const id = state.editor.currentId;
     const sandbox = state.editor.currentSandbox;
-    const updatedSandbox = await effects.api.getSandbox(id);
+    const updatedSandbox = await effects.api.getSandbox(sandbox.id);
 
     sandbox.collection = updatedSandbox.collection;
     sandbox.owned = updatedSandbox.owned;

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

@@ -83,7 +83,7 @@ export const withOwnedSandbox = <T>(
     }
 
     await actions.editor.internal.forkSandbox({
-      sandboxId: state.editor.currentId,
+      sandboxId: state.editor.currentSandbox.id,
     });
   } else if (
     state.editor.currentSandbox.isFrozen &&
@@ -93,7 +93,7 @@ export const withOwnedSandbox = <T>(
 
     if (modalResponse === 'fork') {
       await actions.editor.internal.forkSandbox({
-        sandboxId: state.editor.currentId,
+        sandboxId: state.editor.currentSandbox.id,
       });
     } else if (modalResponse === 'unfreeze') {
       state.editor.sessionFrozen = false;

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

@@ -171,9 +171,6 @@ export const setCurrentSandbox: AsyncAction<Sandbox> = async (
   { state, effects, actions },
   sandbox
 ) => {
-  const oldSandboxId =
-    state.editor.currentId === sandbox.id ? null : state.editor.currentId;
-
   state.editor.sandboxes[sandbox.id] = sandbox;
   state.editor.currentId = sandbox.id;
 
@@ -288,13 +285,6 @@ export const setCurrentSandbox: AsyncAction<Sandbox> = async (
   });
 
   effects.executor.setupExecutor();
-
-  /*
-    There seems to be a race condition here? Verify if this still happens with Overmind
-  */
-  if (oldSandboxId && oldSandboxId !== state.editor.currentId) {
-    delete state.editor.sandboxes[oldSandboxId];
-  }
 };
 
 export const updateCurrentSandbox: AsyncAction<Sandbox> = async (

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

@@ -1,4 +1,5 @@
 import { Action, AsyncAction } from 'app/overmind';
+
 import * as internalActions from './internalActions';
 
 export const internal = internalActions;
@@ -42,10 +43,10 @@ export const deployWithNetlify: AsyncAction = async ({
 export const getNetlifyDeploys: AsyncAction = async ({ state, effects }) => {
   try {
     state.deployment.netlifyClaimUrl = await effects.netlify.claimSite(
-      state.editor.currentId
+      state.editor.currentSandbox.id
     );
     state.deployment.netlifySite = await effects.netlify.getDeployments(
-      state.editor.currentId
+      state.editor.currentSandbox.id
     );
   } catch (error) {
     state.deployment.netlifySite = null;

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

@@ -78,7 +78,7 @@ export const sandboxChanged: AsyncAction<{ id: string }> = withLoadApp<{
   newId = actions.editor.internal.ensureSandboxId(newId);
 
   // This happens when we fork. This can be avoided with state first routing
-  if (state.editor.currentId === newId) {
+  if (state.editor.isForkingSandbox) {
     return;
   }
 
@@ -304,7 +304,7 @@ export const forkSandboxClicked: AsyncAction = async ({
   }
 
   await actions.editor.internal.forkSandbox({
-    sandboxId: state.editor.currentId,
+    sandboxId: state.editor.currentSandbox.id,
   });
 };
 
@@ -475,7 +475,7 @@ export const frozenUpdated: AsyncAction<{ frozen: boolean }> = async (
 ) => {
   state.editor.currentSandbox.isFrozen = frozen;
 
-  await effects.api.saveFrozen(state.editor.currentId, frozen);
+  await effects.api.saveFrozen(state.editor.currentSandbox.id, frozen);
 };
 
 export const quickActionsOpened: Action = ({ state }) => {
@@ -531,15 +531,15 @@ export const fetchEnvironmentVariables: AsyncAction = async ({
   effects,
 }) => {
   state.editor.currentSandbox.environmentVariables = await effects.api.getEnvironmentVariables(
-    state.editor.currentId
+    state.editor.currentSandbox.id
   );
 };
 
 export const updateEnvironmentVariables: AsyncAction<
   EnvironmentVariable
 > = async ({ state, effects }, environmentVariable) => {
   state.editor.currentSandbox.environmentVariables = await effects.api.saveEnvironmentVariable(
-    state.editor.currentId,
+    state.editor.currentSandbox.id,
     environmentVariable
   );
 
@@ -549,7 +549,7 @@ export const updateEnvironmentVariables: AsyncAction<
 export const deleteEnvironmentVariable: AsyncAction<{
   name: string;
 }> = async ({ state, effects }, { name }) => {
-  const id = state.editor.currentId;
+  const { id } = state.editor.currentSandbox;
 
   state.editor.currentSandbox.environmentVariables = await effects.api.deleteEnvironmentVariable(
     id,
@@ -745,11 +745,7 @@ export const renameModule: AsyncAction<{
   module.title = title;
 
   try {
-    await effects.api.saveModuleTitle(
-      state.editor.currentId,
-      moduleShortid,
-      title
-    );
+    await effects.api.saveModuleTitle(sandbox.id, moduleShortid, title);
 
     if (state.live.isCurrentEditor) {
       effects.live.sendModuleUpdate(module);

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

@@ -188,7 +188,10 @@ export const updateCurrentTemplate: AsyncAction = async ({
           getTemplateDefinition(newTemplate).isServer
       ) {
         state.editor.currentSandbox.template = newTemplate;
-        await effects.api.saveTemplate(state.editor.currentId, newTemplate);
+        await effects.api.saveTemplate(
+          state.editor.currentSandbox.id,
+          newTemplate
+        );
       }
     }
   } catch (e) {
@@ -223,7 +226,6 @@ export const setModuleCode: Action<{
   module: Module;
   code: string;
 }> = ({ state, effects }, { module, code }) => {
-  const { currentId } = state.editor;
   const { currentSandbox } = state.editor;
   const hasChangedModuleId = state.editor.changedModuleShortids.includes(
     module.shortid
@@ -253,7 +255,7 @@ export const setModuleCode: Action<{
 
   // Save the code to localStorage so we can recover in case of a crash
   effects.moduleRecover.save(
-    currentId,
+    currentSandbox.id,
     currentSandbox.version,
     module,
     code,
@@ -309,8 +311,7 @@ export const forkSandbox: AsyncAction<{
       effects.preview.executeCodeImmediately(true);
 
       // When not server we "piggyback" the existing Sandbox to avoid any rerenders and need
-      // for new bundler. We do not reference the sandbox by `currentId` anywhere,
-      // so this should be safe. The url of the preview is updated
+      // for new bundler. Preview updates its url though
     } else {
       Object.assign(
         state.editor.sandboxes[state.editor.currentId],

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

@@ -225,10 +225,7 @@ export const directoryDeleted: AsyncAction<{
     effects.vscode.openModule(state.editor.currentModule);
     actions.editor.internal.updatePreviewCode();
     try {
-      await effects.api.deleteDirectory(
-        state.editor.currentId,
-        directoryShortid
-      );
+      await effects.api.deleteDirectory(sandbox.id, directoryShortid);
       effects.live.sendDirectoryDeleted(directoryShortid);
     } catch (error) {
       sandbox.directories.push(removedDirectory);
@@ -374,7 +371,7 @@ export const massCreateModules: AsyncAction<{
     { state, actions, effects },
     { modules, directories, directoryShortid, cbID }
   ) => {
-    const sandboxId = state.editor.currentId;
+    const sandboxId = state.editor.currentSandbox.id;
 
     try {
       const data = await effects.api.massCreateModules(
@@ -550,7 +547,7 @@ export const syncSandbox: AsyncAction<any[]> = async (
   { state, effects },
   updates
 ) => {
-  const id = state.editor.currentId;
+  const { id } = state.editor.currentSandbox;
 
   try {
     const newSandbox = await effects.api.getSandbox(id);

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

@@ -1,4 +1,5 @@
 import { Action, AsyncAction } from 'app/overmind';
+
 import * as internalActions from './internalActions';
 
 export const internal = internalActions;
@@ -50,7 +51,7 @@ export const gitMounted: AsyncAction = ({ actions }) =>
 
 export const createCommitClicked: AsyncAction = async ({ state, effects }) => {
   const { git } = state;
-  const id = state.editor.currentId;
+  const { id } = state.editor.currentSandbox;
 
   git.commit = null;
   git.isCommitting = true;
@@ -91,7 +92,7 @@ export const createPrClicked: AsyncAction = async ({ state, effects }) => {
   state.git.isCreatingPr = true;
   state.currentModal = 'pr';
 
-  const id = state.editor.currentId;
+  const { id } = state.editor.currentSandbox;
   const pr = await effects.api.createGitPr(
     id,
     `${state.git.subject}${
@@ -104,9 +105,7 @@ export const createPrClicked: AsyncAction = async ({ state, effects }) => {
 
   const { user } = state;
   const git = state.editor.currentSandbox.originalGit;
-  const url = `https://github.com/${git.username}/${git.repo}/compare/${
-    git.branch
-  }...${user.username}:${pr.newBranch}?expand=1`;
+  const url = `https://github.com/${git.username}/${git.repo}/compare/${git.branch}...${user.username}:${pr.newBranch}?expand=1`;
 
   state.git.pr.prURL = url;
 

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

@@ -1,7 +1,7 @@
 import { AsyncAction } from 'app/overmind';
 
 export const fetchGitChanges: AsyncAction = async ({ state, effects }) => {
-  const id = state.editor.currentId;
+  const { id } = state.editor.currentSandbox;
 
   state.git.isFetching = true;
   state.git.originalGitChanges = await effects.api.getGitChanges(id);

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

@@ -131,7 +131,7 @@ export const externalResourceAdded: AsyncAction<{
   actions.editor.internal.updatePreviewCode();
 
   try {
-    await effects.api.createResource(state.editor.currentId, resource);
+    await effects.api.createResource(state.editor.currentSandbox.id, resource);
   } catch (error) {
     externalResources.splice(externalResources.indexOf(resource), 1);
     effects.notificationToast.error('Could not save external resource');
@@ -149,7 +149,7 @@ export const externalResourceRemoved: AsyncAction<{
   actions.editor.internal.updatePreviewCode();
 
   try {
-    await effects.api.deleteResource(state.editor.currentId, resource);
+    await effects.api.deleteResource(state.editor.currentSandbox.id, resource);
   } catch (error) {
     externalResources.splice(resourceIndex, 0, resource);
     effects.notificationToast.error(
@@ -172,7 +172,7 @@ export const sandboxDeleted: AsyncAction = async ({
 }) => {
   actions.modalClosed();
 
-  await effects.api.deleteSandbox(state.editor.currentId);
+  await effects.api.deleteSandbox(state.editor.currentSandbox.id);
 
   // Not sure if this is in use?
   state.workspace.showDeleteSandboxModal = false;
@@ -186,7 +186,7 @@ export const sandboxPrivacyChanged: AsyncAction<{
 }> = async ({ state, effects, actions }, { privacy }) => {
   const oldPrivacy = state.editor.currentSandbox.privacy;
   const sandbox = await effects.api.updatePrivacy(
-    state.editor.currentId,
+    state.editor.currentSandbox.id,
     privacy
   );
   state.editor.currentSandbox.previewSecret = sandbox.previewSecret;
@@ -225,7 +225,7 @@ export const deleteTemplate: AsyncAction = async ({
   effects,
 }) => {
   effects.analytics.track('Template - Removed', { source: 'editor' });
-  const sandboxId = state.editor.currentId;
+  const sandboxId = state.editor.currentSandbox.id;
   const templateId = state.editor.currentSandbox.customTemplate.id;
 
   try {
@@ -247,7 +247,7 @@ export const editTemplate: AsyncAction<CustomTemplate> = async (
 ) => {
   effects.analytics.track('Template - Edited', { source: 'editor' });
 
-  const sandboxId = state.editor.currentId;
+  const sandboxId = state.editor.currentSandbox.id;
 
   try {
     const updatedTemplate = await effects.api.updateTemplate(
@@ -270,7 +270,7 @@ export const addedTemplate: AsyncAction<{
 }> = async ({ state, actions, effects }, template) => {
   effects.analytics.track('Template - Created', { source: 'editor' });
 
-  const sandboxId = state.editor.currentId;
+  const sandboxId = state.editor.currentSandbox.id;
 
   try {
     const newTemplate = await effects.api.createTemplate(sandboxId, template);