Fix forking bug where modules are not updated after fork

Author: Ives van Hoorne

src/app/store/entities/sandboxes/actions/files.js

@@ -102,11 +102,14 @@ const renameModule = (id: string, moduleId: string, title: string) => async (
   dispatch: Function,
   getState: Function,
 ) => {
-  const modules = modulesSelector(getState());
+  let modules = modulesSelector(getState());
   const module = modules[moduleId];
   const sandboxId = await dispatch(maybeForkSandbox(id));
   const isForked = sandboxId !== id;
 
+  // Modules have updated after fork
+  modules = modulesSelector(getState());
+
   const newModule = isForked
     ? getEquivalentModule(module, values(modules)) || module
     : module;
@@ -135,12 +138,14 @@ const renameDirectory = (
   directoryId: string,
   title: string,
 ) => async (dispatch: Function, getState: Function) => {
-  const directories = directoriesSelector(getState());
+  let directories = directoriesSelector(getState());
   const directory = directories[directoryId];
   const sandboxId = await dispatch(maybeForkSandbox(id));
-
   const isForked = id !== sandboxId;
 
+  // Directories have updated after fork
+  directories = directoriesSelector(getState());
+
   const newDirectory = isForked
     ? getEquivalentDirectory(directory, values(directories)) || directory
     : directory;
@@ -169,11 +174,14 @@ const moveModuleToDirectory = (
   moduleId: string,
   directoryShortid: string,
 ) => async (dispatch: Function, getState: Function) => {
-  const modules = modulesSelector(getState());
+  let modules = modulesSelector(getState());
   const module = modules[moduleId];
   const sandboxId = await dispatch(maybeForkSandbox(id));
   const isForked = sandboxId !== id;
 
+  // Modules have updated after fork
+  modules = modulesSelector(getState());
+
   const newModule = isForked
     ? getEquivalentModule(module, values(modules)) || module
     : module;
@@ -202,12 +210,14 @@ const moveDirectoryToDirectory = (
   directoryId: string,
   parentId: string,
 ) => async (dispatch: Function, getState: Function) => {
-  const directories = directoriesSelector(getState());
+  let directories = directoriesSelector(getState());
   const directory = directories[directoryId];
   const sandboxId = await dispatch(maybeForkSandbox(id));
-
   const isForked = id !== sandboxId;
 
+  // Directories have updated after fork
+  directories = directoriesSelector(getState());
+
   const newDirectory = isForked
     ? getEquivalentDirectory(directory, values(directories)) || directory
     : directory;
@@ -237,11 +247,14 @@ const deleteModule = (id: string, moduleId: string) => async (
   dispatch: Function,
   getState: Function,
 ) => {
-  const modules = modulesSelector(getState());
+  let modules = modulesSelector(getState());
   const module = modules[moduleId];
   const sandboxId = await dispatch(maybeForkSandbox(id));
   const isForked = sandboxId !== id;
 
+  // Modules have updated after fork
+  modules = modulesSelector(getState());
+
   const newModule = isForked
     ? getEquivalentModule(module, values(modules)) || module
     : module;
@@ -268,12 +281,14 @@ const deleteDirectory = (id: string, directoryId: string) => async (
   dispatch: Function,
   getState: Function,
 ) => {
-  const directories = directoriesSelector(getState());
+  let directories = directoriesSelector(getState());
   const directory = directories[directoryId];
   const sandboxId = await dispatch(maybeForkSandbox(id));
-
   const isForked = id !== sandboxId;
 
+  // Directories have updated after fork
+  directories = directoriesSelector(getState());
+
   const newDirectory = isForked
     ? getEquivalentDirectory(directory, values(directories)) || directory
     : directory;
@@ -362,11 +377,14 @@ const saveModuleCode = (id: string, moduleId: string) => async (
   dispatch: Function,
   getState: Function,
 ) => {
-  const modules = modulesSelector(getState());
+  let modules = modulesSelector(getState());
   const module = modules[moduleId];
   const sandboxId = await dispatch(maybeForkSandbox(id));
   const isForked = sandboxId !== id;
 
+  // Modules have updated after fork
+  modules = modulesSelector(getState());
+
   const newModule = isForked
     ? getEquivalentModule(module, values(modules)) || module
     : module;

src/app/store/entities/sandboxes/actions/fork.test.js

@@ -10,6 +10,14 @@ describe('equivalent', () => {
     expect(getEquivalentModule(module, modules)).toEqual(eqModule);
   });
 
+  it('finds the equivalent module if order is the other way around', () => {
+    const module = createModule();
+    const eqModule = createModule(0, { ...module, id: 'newid' });
+    const modules = [eqModule, eqModule];
+
+    expect(getEquivalentModule(module, modules)).toEqual(eqModule);
+  });
+
   it('returns undefined when equivalent module not found', () => {
     const module = createModule();