some more fixes

Author: christianalfoni

packages/app/src/app/overmind/namespaces/editor/models/EditorSandbox.ts

@@ -26,13 +26,46 @@ import { parseConfigurations } from 'app/overmind/utils/parse-configurations';
 import { json } from 'overmind';
 
 export class EditorSandbox {
-  private currentSandbox: Sandbox = ({
-    id: null,
-    title: 'New',
-    owned: false,
-    userLiked: false,
+  private currentSandbox: Sandbox = {
+    id: '',
+    alias: null,
+    title: null,
+    description: '',
+    viewCount: 0,
     likeCount: 0,
-  } as unknown) as Sandbox;
+    forkCount: 0,
+    userLiked: false,
+    modules: [],
+    directories: [],
+    featureFlags: {},
+    collection: null,
+    owned: false,
+    authorization: 'none',
+    npmDependencies: {},
+    customTemplate: null,
+    forkedTemplate: null,
+    forkedTemplateSandbox: null,
+    externalResources: [],
+    team: null,
+    roomId: null,
+    privacy: 0,
+    author: null,
+    forkedFromSandbox: null,
+    git: null,
+    tags: [],
+    isFrozen: false,
+    environmentVariables: null,
+    sourceId: '',
+    source: undefined,
+    template: 'custom',
+    entry: '',
+    originalGit: null,
+    originalGitCommitSha: null,
+    originalGitChanges: null,
+    version: 0,
+    screenshotUrl: null,
+    previewSecret: null,
+  };
 
   private currentModuleShortid: string | null = null;
   private changedModuleShortids: string[] = [];

packages/app/src/app/overmind/utils/items.ts

@@ -89,7 +89,7 @@ export function getDisabledItems(store: any): INavigationItem[] {
 }
 
 export default function getItems(store: any): INavigationItem[] {
-  if (!store.editor.currentSandbox) {
+  if (!store.editor.sandbox.id) {
     return [];
   }
   if (
@@ -101,7 +101,7 @@ export default function getItems(store: any): INavigationItem[] {
         store.live.roomInfo &&
         store.live.roomInfo.ownerIds.indexOf(store.user.id) > -1)
     ) &&
-    !hasPermission(store.editor.currentSandbox.authorization, 'write_project')
+    !store.editor.sandbox.hasPermission('write_project')
   ) {
     return [FILES, LIVE];
   }
@@ -119,8 +119,8 @@ export default function getItems(store: any): INavigationItem[] {
     CONFIGURATION,
   ];
 
-  if (store.isLoggedIn && sandbox) {
-    const templateDef = getTemplate(sandbox.template);
+  if (store.isLoggedIn) {
+    const templateDef = sandbox.templateDefinition;
     if (templateDef.isServer) {
       items.push(SERVER);
     }
@@ -138,11 +138,7 @@ export default function getItems(store: any): INavigationItem[] {
     items.push(DEPLOYMENT);
   }
 
-  if (
-    store.isLoggedIn &&
-    sandbox &&
-    hasPermission(sandbox.authorization, 'write_code')
-  ) {
+  if (store.isLoggedIn && sandbox.hasPermission('write_code')) {
     items.push(LIVE);
   }
 

packages/app/src/app/pages/Sandbox/Editor/Content/index.tsx

@@ -63,8 +63,8 @@ export const MainWorkspace: React.FC<{ theme: any }> = ({ theme }) => {
   const template = sandbox && getTemplateDefinition(sandbox.template);
   const views = state.editor.devToolTabs;
   const currentPosition = state.editor.currentDevToolsPosition;
-  const modulePath = sandbox.currentModule.path;
-  const config = template.configurationFiles[modulePath];
+  const modulePath = sandbox.currentModule?.path;
+  const config = modulePath ? template.configurationFiles[modulePath] : null;
 
   const browserConfig = {
     id: 'codesandbox.browser',

packages/app/src/app/pages/Sandbox/Editor/Header/Collaborators/CollaboratorList.tsx

@@ -10,8 +10,6 @@ import React from 'react';
 
 import { Collaborator, CollaboratorItem, Invitation } from './Collaborator';
 
-y;
-
 const Animated = ({ showMountAnimations, ...props }) => (
   <motion.div
     animate={{ opacity: 1, height: 'auto' }}