Merge branch 'master' into refactor/editor-files

Author: SaraVieira

.all-contributorsrc

@@ -1396,10 +1396,19 @@
       ]
     },
     {
-      "login": "ivandevp",
+    "login": "ivandevp",
       "name": "Ivan Medina",
       "avatar_url": "https://avatars3.githubusercontent.com/u/9284690?v=4",
       "profile": "https://twitter.com/ivandevp",
+            "contributions": [
+        "code"
+      ]
+      },
+    {
+      "login": "Gobinath-Manokaran",
+      "name": "Gobinath-Manokaran",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/6711914?v=4",
+      "profile": "https://github.com/Gobinath-Manokaran",
       "contributions": [
         "code"
       ]

.drone.yml

@@ -4,7 +4,7 @@ name: default
 
 steps:
   - name: restore node_modules cache
-    image: codesandbox-cache:1
+    image: lbogdan/codesandbox-cache-plugin:1
     settings:
       restore: true
     volumes:
@@ -15,7 +15,7 @@ steps:
         - pull_request
 
   - name: install packages
-    image: node:10.15.3-jessie
+    image: node:10.16.3-jessie
     volumes:
       - name: yarn-cache
         path: /usr/local/share/.cache/yarn/v4
@@ -26,7 +26,7 @@ steps:
         - pull_request
 
   - name: build
-    image: node:10.15.3-jessie
+    image: node:10.16.3-jessie
     commands:
       - export STAGING_BRANCH=pr$DRONE_PULL_REQUEST
       - yarn build
@@ -35,7 +35,7 @@ steps:
         - pull_request
 
   - name: deploy
-    image: codesandbox-deploy:1
+    image: lbogdan/codesandbox-deploy-plugin:1
     settings:
       domain: &domain build.csb.dev
     volumes:
@@ -48,7 +48,7 @@ steps:
         - pull_request
 
   - name: create github deployment
-    image: codesandbox-github-deployment:1
+    image: lbogdan/github-deployment-plugin:1
     settings:
       domain: *domain
       github_token:
@@ -76,8 +76,23 @@ steps:
         - success
         - failure
 
+  - name: github comment
+    image: lbogdan/github-comment-plugin:1
+    settings:
+      domain: *domain
+      github_token:
+        from_secret: github_token
+      template: |
+        Build for latest commit https://github.com/{{owner}}/{{repo}}/pull/{{pr}}/commits/{{commitSha}} {{#success}}is at https://pr{{pr}}.{{buildDomain}}/s/new{{/success}}{{^success}}failed{{/success}}.
+    when:
+      event:
+        - pull_request
+      status:
+        - success
+        - failure
+
   - name: rebuild node_modules cache
-    image: codesandbox-cache:1
+    image: lbogdan/codesandbox-cache-plugin:1
     settings:
       rebuild: true
     volumes:
@@ -102,6 +117,6 @@ volumes:
       path: /root/docker/deployments
 ---
 kind: signature
-hmac: 4d9c06dbed6f93871c3a0bb5b80b35e353d8a5254d84ba07c0fb14e4f6ea9ecd
+hmac: c3f983c3f9243b3da5fd33f2d22435338c96486e27d5fb569455c05e55353a51
 
 ...

README.md

@@ -236,6 +236,8 @@ Thanks goes to these wonderful people
   <tr>
     <td align="center"><a href="http://hetpatel33.github.io"><img src="https://avatars0.githubusercontent.com/u/13877514?v=4" width="100px;" alt="Het Patel"/><br /><sub><b>Het Patel</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=hetpatel33" title="Code">💻</a></td>
     <td align="center"><a href="https://twitter.com/ivandevp"><img src="https://avatars3.githubusercontent.com/u/9284690?v=4" width="100px;" alt="Ivan Medina"/><br /><sub><b>Ivan Medina</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=ivandevp" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/milap1296"><img src="https://avatars2.githubusercontent.com/u/19545730?v=4" width="100px;" alt="milap1296"/><br /><sub><b>milap1296</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=milap1296" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Gobinath-Manokaran"><img src="https://avatars2.githubusercontent.com/u/6711914?v=4" width="100px;" alt="Gobinath-Manokaran"/><br /><sub><b>Gobinath-Manokaran</b></sub></a><br /><a href="https://github.com/codesandbox/codesandbox-client/commits?author=Gobinath-Manokaran" title="Code">💻</a></td>
   </tr>
 </table>
 

packages/app/integration-tests/BrowserStackLocal

@@ -239,6 +239,7 @@
     "@types/react-dom": "^16.8.3",
     "@types/react-helmet": "^5.0.11",
     "@types/react-icons": "2.2.7",
+    "@types/react-router-dom": "^4.3.1",
     "@types/react-stripe-elements": "^1.3.2",
     "@types/resolve": "^0.0.8",
     "@types/socket.io-client": "^1.4.32",

packages/app/package.json

@@ -64,6 +64,7 @@ export const connectionChanged: Action<boolean> = ({ state }, connected) => {
 
 type ModalName =
   | 'deleteDeployment'
+  | 'deleteSandbox'
   | 'feedback'
   | 'forkServerModal'
   | 'liveSessionEnded'

packages/app/src/app/overmind/actions.ts

@@ -23,15 +23,15 @@ import { client } from 'app/graphql/client';
 import { LIST_TEMPLATES } from 'app/pages/Dashboard/queries';
 
 import {
-  transformSandbox,
   transformDirectory,
   transformModule,
+  transformSandbox,
 } from '../utils/sandbox';
 import apiFactory, { Api, ApiConfig } from './apiFactory';
 import {
-  SandboxAPIResponse,
-  IModuleAPIResponse,
   IDirectoryAPIResponse,
+  IModuleAPIResponse,
+  SandboxAPIResponse,
 } from './types';
 
 let api: Api;
@@ -154,7 +154,9 @@ export default {
       },
     });
   },
-  getEnvironmentVariables(sandboxId: string): Promise<EnvironmentVariable[]> {
+  getEnvironmentVariables(
+    sandboxId: string
+  ): Promise<{ [key: string]: string }> {
     return api.get(
       `/sandboxes/${sandboxId}/env`,
       {},
@@ -164,7 +166,7 @@ export default {
   saveEnvironmentVariable(
     sandboxId: string,
     environmentVariable: EnvironmentVariable
-  ): Promise<EnvironmentVariable[]> {
+  ): Promise<{ [key: string]: string }> {
     return api.post(
       `/sandboxes/${sandboxId}/env`,
       {
@@ -178,7 +180,7 @@ export default {
   deleteEnvironmentVariable(
     sandboxId: string,
     name: string
-  ): Promise<EnvironmentVariable[]> {
+  ): Promise<{ [key: string]: string }> {
     return api.delete(
       `/sandboxes/${sandboxId}/env/${name}`,
       {},
@@ -451,7 +453,7 @@ export default {
   },
   createTemplate(
     sandboxId: string,
-    template: CustomTemplate
+    template: { color: string; description: string; title: string }
   ): Promise<CustomTemplate> {
     return api
       .post<{ template: CustomTemplate }>(`/sandboxes/${sandboxId}/templates`, {

packages/app/src/app/overmind/effects/api/index.ts

@@ -66,11 +66,16 @@ export const withLoadApp = <T>(
 };
 
 export const withOwnedSandbox = <T>(
-  continueAction: AsyncAction<T>
+  continueAction: AsyncAction<T>,
+  cancelAction: AsyncAction<T> = () => Promise.resolve()
 ): AsyncAction<T> => async (context, payload) => {
   const { state, actions } = context;
 
   if (!state.editor.currentSandbox.owned) {
+    if (state.editor.isForkingSandbox) {
+      return cancelAction(context, payload);
+    }
+
     await actions.editor.internal.forkSandbox({
       sandboxId: state.editor.currentId,
     });
@@ -87,11 +92,10 @@ export const withOwnedSandbox = <T>(
     } else if (modalResponse === 'unfreeze') {
       state.editor.sessionFrozen = false;
     } else if (modalResponse === 'cancel') {
-      return;
+      return cancelAction(context, payload);
     }
   }
 
-  // eslint-disable-next-line consistent-return
   return continueAction(context, payload);
 };
 

packages/app/src/app/overmind/factories.ts

@@ -152,13 +152,18 @@ export const codeSaved: AsyncAction<{
   code: string;
   moduleShortid: string;
   cbID: string;
-}> = withOwnedSandbox(async ({ actions }, { code, moduleShortid, cbID }) => {
-  actions.editor.internal.saveCode({
-    code,
-    moduleShortid,
-    cbID,
-  });
-});
+}> = withOwnedSandbox(
+  async ({ actions }, { code, moduleShortid, cbID }) => {
+    actions.editor.internal.saveCode({
+      code,
+      moduleShortid,
+      cbID,
+    });
+  },
+  async ({ effects }, { cbID }) => {
+    effects.vscode.callCallbackError(cbID);
+  }
+);
 
 export const codeChanged: Action<{
   code: string;

packages/app/src/app/overmind/namespaces/editor/actions.ts

@@ -166,12 +166,15 @@ export const saveCode: AsyncAction<{
     effects.notificationToast.warning(error.message);
 
     if (cbID) {
-      effects.vscode.callCallbackError(cbID);
+      effects.vscode.callCallbackError(cbID, error.message);
     }
   }
 };
 
-export const updateCurrentTemplate: Action = ({ state, effects }) => {
+export const updateCurrentTemplate: AsyncAction = async ({
+  state,
+  effects,
+}) => {
   try {
     const currentTemplate = state.editor.currentSandbox.template;
     const templateDefinition = getTemplateDefinition(currentTemplate);
@@ -201,7 +204,7 @@ export const updateCurrentTemplate: Action = ({ state, effects }) => {
           getTemplateDefinition(newTemplate).isServer
       ) {
         state.editor.currentSandbox.template = newTemplate;
-        effects.api.saveTemplate(state.editor.currentId, newTemplate);
+        await effects.api.saveTemplate(state.editor.currentId, newTemplate);
       }
     }
   } catch (e) {