Fix embed view currentmodule

Author: Ives van Hoorne

src/app/store/entities/sandboxes/modules/selectors.js

@@ -8,16 +8,20 @@ function findById(entities, id) {
   return entities.find(e => e.id === id);
 }
 
+function findByShortid(entities, shortid) {
+  return entities.find(e => e.shortid === shortid);
+}
+
 export const getModulePath = (modules, directories, id) => {
   const module = findById(modules, id);
 
   if (!module) return '';
 
-  let directory = findById(directories, module.directoryShortid);
+  let directory = findByShortid(directories, module.directoryShortid);
   let path = '/';
   while (directory != null) {
     path = `/${directory.title}${path}`;
-    directory = findById(directories, directory.directoryShortid);
+    directory = findByShortid(directories, directory.directoryShortid);
   }
   return path;
 };

src/embed/App.js

@@ -101,7 +101,7 @@ export default class App extends React.PureComponent {
         currentModule: this.state.currentModule ||
           response.data.modules.find(
             m => m.title === 'index.js' && m.directoryShortid == null,
-          ).id,
+          ).shortid,
       });
     } catch (e) {
       this.setState({ notFound: true });

src/embed/components/Content.js

@@ -74,7 +74,7 @@ export default class Content extends React.Component {
 
     const preferences = { livePreviewEnabled: true };
     const mainModule =
-      sandbox.modules.find(m => m.id === currentModule) ||
+      sandbox.modules.find(m => m.shortid === currentModule) ||
       sandbox.modules.find(
         m => m.title === 'index.js' && m.directoryShortid == null,
       );

src/embed/components/Files.js

@@ -39,9 +39,9 @@ const Files = ({
   return (
     <Container>
       {sortBy(childrenDirectories, d => d.title).map(d => (
-        <div key={d.id}>
+        <div key={d.shortid}>
           <File
-            id={d.id}
+            id={d.shortid}
             title={d.title}
             type="directory"
             depth={depth}
@@ -50,7 +50,7 @@ const Files = ({
           <Files
             modules={modules}
             directories={directories}
-            directoryId={d.id}
+            directoryId={d.shortid}
             depth={depth + 1}
             setCurrentModule={setCurrentModule}
             currentModule={currentModule}
@@ -59,13 +59,13 @@ const Files = ({
       ))}
       {sortBy(childrenModules, m => m.title).map(m => (
         <File
-          id={m.id}
+          id={m.shortid}
           title={m.title}
-          key={m.id}
+          key={m.shortid}
           type="module"
           depth={depth}
           setCurrentModule={setCurrentModule}
-          active={m.id === currentModule}
+          active={m.shortid === currentModule}
           alternative={m.title === 'index.js' && m.directoryShortid == null}
         />
       ))}