Fix file/directory moving bugs

Author: Ives van Hoorne

packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/DirectoryEntry/Entry/index.js

@@ -174,7 +174,11 @@ const entrySource = {
   canDrag: props => !!props.id && !props.isMainModule,
   beginDrag: props => {
     if (props.closeTree) props.closeTree();
-    return { id: props.id, directory: props.type === 'directory' };
+    return {
+      id: props.id,
+      shortid: props.shortid,
+      directory: props.type === 'directory' || props.type === 'directory-open',
+    };
   },
 };
 

packages/app/src/app/pages/Sandbox/Editor/Workspace/Files/DirectoryEntry/index.js

@@ -314,12 +314,12 @@ const entryTarget = {
 
     if (sourceItem.directory) {
       props.signals.files.directoryMovedToDirectory({
-        directoryId: sourceItem.id,
+        shortid: sourceItem.shortid,
         directoryShortid: props.shortid,
       });
     } else {
       props.signals.files.moduleMovedToDirectory({
-        moduleId: sourceItem.id,
+        moduleShortid: sourceItem.shortid,
         directoryShortid: props.shortid,
       });
     }

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

@@ -12,10 +12,7 @@ export function whenModuleIsSelected({ state, props, path }) {
 
 export function saveNewDirectoryDirectoryShortid({ api, state, props, path }) {
   const sandboxId = state.get('editor.currentId');
-  const sandbox = state.get('editor.currentSandbox');
-  const shortid = sandbox.directories.find(
-    directory => directory.id === props.directoryId
-  ).shortid;
+  const shortid = props.shortid;
 
   return api
     .put(`/sandboxes/${sandboxId}/directories/${shortid}`, {
@@ -27,9 +24,7 @@ export function saveNewDirectoryDirectoryShortid({ api, state, props, path }) {
 
 export function saveNewModuleDirectoryShortid({ api, state, props, path }) {
   const sandboxId = state.get('editor.currentId');
-  const sandbox = state.get('editor.currentSandbox');
-  const shortid = sandbox.modules.find(module => module.id === props.moduleId)
-    .shortid;
+  const shortid = props.moduleShortid;
 
   return api
     .put(`/sandboxes/${sandboxId}/modules/${shortid}`, {
@@ -124,9 +119,9 @@ export function removeOptimisticDirectory({ state, props }) {
 export function moveDirectoryToDirectory({ state, props }) {
   const sandbox = state.get('editor.currentSandbox');
   const directoryIndex = sandbox.directories.findIndex(
-    directory => directory.id === props.directoryId
+    directory => directory.shortid === props.shortid
   );
-  const currentDirectortyShortid = state.get(
+  const currentDirectoryShortid = state.get(
     `editor.sandboxes.${sandbox.id}.directories.${
       directoryIndex
     }.directoryShortid`
@@ -139,39 +134,39 @@ export function moveDirectoryToDirectory({ state, props }) {
     props.directoryShortid
   );
 
-  return { currentDirectortyShortid };
+  return { currentDirectoryShortid };
 }
 
 export function revertMoveDirectoryToDirectory({ state, props }) {
   const sandbox = state.get('editor.currentSandbox');
   const directoryIndex = sandbox.directories.findIndex(
-    directory => directory.id === props.directoryId
+    directory => directory.shortid === props.shortid
   );
 
   state.set(
     `editor.sandboxes.${sandbox.id}.directories.${
       directoryIndex
     }.directoryShortid`,
-    props.currentDirectortyShortid
+    props.currentDirectoryShortid
   );
 }
 
 export function revertMoveModuleToDirectory({ state, props }) {
   const sandbox = state.get('editor.currentSandbox');
   const moduleIndex = sandbox.modules.findIndex(
-    module => module.id === props.moduleId
+    module => module.shortid === props.moduleShortid
   );
 
   state.set(
     `editor.sandboxes.${sandbox.id}.modules.${moduleIndex}.directoryShortid`,
-    props.currentDirectortyShortid
+    props.currentDirectoryShortid
   );
 }
 
 export function moveModuleToDirectory({ state, props }) {
   const sandbox = state.get('editor.currentSandbox');
   const moduleIndex = sandbox.modules.findIndex(
-    module => module.id === props.moduleId
+    module => module.shortid === props.moduleShortid
   );
 
   state.set(

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

@@ -88,6 +88,7 @@ export const deleteDirectory = [
 ];
 
 export const moveDirectoryToDirectory = [
+  ensureOwnedSandbox,
   actions.moveDirectoryToDirectory,
   actions.saveNewDirectoryDirectoryShortid,
   {
@@ -100,6 +101,7 @@ export const moveDirectoryToDirectory = [
 ];
 
 export const moveModuleToDirectory = [
+  ensureOwnedSandbox,
   actions.moveModuleToDirectory,
   actions.saveNewModuleDirectoryShortid,
   {