Bugfixes

Author: CompuIves

packages/app/src/app/store/actions.js

@@ -46,6 +46,11 @@ export function setUrlOptions({ state, router, utils }) {
     );
 
     if (module) {
+      state.push('editor.tabs', {
+        type: 'module',
+        moduleShortid: module.shortid,
+        dirty: false,
+      });
       state.set('editor.currentModuleShortid', module.shortid);
     }
   }

packages/app/src/app/store/modules/files/actions.js

@@ -222,19 +222,6 @@ export function updateOptimisticModule({ state, props }) {
   );
 }
 
-export function removeOptimisticModule({ state, props }) {
-  const sandbox = state.get('editor.currentSandbox');
-  const optimisticModuleIndex = sandbox.modules.findIndex(
-    module => module.shortid === props.optimisticModule.shortid
-  );
-
-  state.splice(
-    `editor.sandboxes.${sandbox.id}.modules`,
-    optimisticModuleIndex,
-    1
-  );
-}
-
 export function updateOptimisticDirectory({ state, props }) {
   const sandbox = state.get('editor.currentSandbox');
   const optimisticDirectoryIndex = sandbox.directories.findIndex(

packages/app/src/app/store/modules/files/sequences.js

@@ -30,6 +30,21 @@ export const getUploadedFiles = [
   },
 ];
 
+export const removeModule = [
+  ensureOwnedSandbox,
+  actions.whenModuleIsSelected,
+  {
+    true: setCurrentModule(state`editor.mainModule.id`),
+    false: [],
+  },
+  actions.whenCloseTab,
+  {
+    true: closeTabByIndex,
+    false: [],
+  },
+  actions.removeModule,
+];
+
 export const massCreateModules = [
   ensureOwnedSandbox,
   actions.massCreateModules,
@@ -68,7 +83,8 @@ export const createModule = [
       sendModuleCreated,
     ],
     error: [
-      actions.removeOptimisticModule,
+      set(props`moduleShortid`, props`optimisticModule.shortid`),
+      removeModule,
       setCurrentModule(state`editor.mainModule.shortid.id`),
       addNotification('Unable to save new file', 'error'),
     ],
@@ -191,21 +207,6 @@ export const moveModuleToDirectory = [
   },
 ];
 
-export const removeModule = [
-  ensureOwnedSandbox,
-  actions.whenModuleIsSelected,
-  {
-    true: setCurrentModule(state`editor.mainModule.id`),
-    false: [],
-  },
-  actions.whenCloseTab,
-  {
-    true: closeTabByIndex,
-    false: [],
-  },
-  actions.removeModule,
-];
-
 export const deleteModule = [
   removeModule,
   actions.deleteModule,

packages/app/src/app/store/sequences.js

@@ -8,7 +8,7 @@ import {
   saveNewModule,
   createOptimisticModule,
   updateOptimisticModule,
-  removeOptimisticModule,
+  removeModule,
 } from './modules/files/actions';
 
 import { disconnect } from './modules/live/actions';
@@ -47,7 +47,10 @@ export const ensurePackageJSON = [
           saveNewModule,
           {
             success: [updateOptimisticModule],
-            error: [removeOptimisticModule],
+            error: [
+              set(props`moduleShortid`, props`optimisticModule.shortid`),
+              removeModule,
+            ],
           },
           set(props`title`, props`backupTitle`),
           set(props`newCode`, props`backupCode`),