Merge branch 'master' into overmind/DeleteProfileSandboxModal

Author: Saeris

.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
 
 ...

packages/app/src/app/pages/common/Modals/DeleteDeploymentModal/index.tsx

@@ -1,23 +1,22 @@
 import React, { FunctionComponent } from 'react';
+
 import { Alert } from 'app/components/Alert';
 import { useOvermind } from 'app/overmind';
 
-const DeleteDeploymentModal: FunctionComponent = () => {
+export const DeleteDeploymentModal: FunctionComponent = () => {
   const {
     actions: {
-      modalClosed,
       deployment: { deleteDeployment },
+      modalClosed,
     },
   } = useOvermind();
 
   return (
     <Alert
-      title="Delete Deployment"
-      body={<span>Are you sure you want to delete this Deployment?</span>}
+      body="Are you sure you want to delete this Deployment?"
       onCancel={() => modalClosed()}
       onConfirm={() => deleteDeployment()}
+      title="Delete Deployment"
     />
   );
 };
-
-export default DeleteDeploymentModal;

packages/app/src/app/pages/common/Modals/EmptyTrash/index.tsx

@@ -1,26 +1,28 @@
+import React, { FunctionComponent } from 'react';
+
 import { Alert } from 'app/components/Alert';
 import { useOvermind } from 'app/overmind';
-import React, { FunctionComponent } from 'react';
+
 import { permanentlyDeleteSandboxes } from '../../../Dashboard/queries';
 
-const EmptyTrash: FunctionComponent = () => {
+export const EmptyTrash: FunctionComponent = () => {
   const {
+    actions: { modalClosed },
     state: {
       dashboard: { trashSandboxIds },
     },
-    actions: { modalClosed },
   } = useOvermind();
+
   return (
     <Alert
-      title="Empty Trash"
       body="Are you sure you want to permanently delete all the sandboxes in the trash?"
       onCancel={() => modalClosed()}
       onConfirm={async () => {
         await permanentlyDeleteSandboxes(trashSandboxIds);
+
         modalClosed();
       }}
+      title="Empty Trash"
     />
   );
 };
-
-export default EmptyTrash;

packages/app/src/app/pages/common/Modals/index.js

@@ -9,11 +9,11 @@ import React, { Component } from 'react';
 import { ThemeProvider } from 'styled-components';
 
 import CommitModal from './CommitModal';
-import DeleteDeploymentModal from './DeleteDeploymentModal';
 import { DeleteProfileSandboxModal } from './DeleteProfileSandboxModal';
+import { DeleteDeploymentModal } from './DeleteDeploymentModal';
 import DeleteSandboxModal from './DeleteSandboxModal';
 import DeploymentModal from './DeploymentModal';
-import EmptyTrash from './EmptyTrash';
+import { EmptyTrash } from './EmptyTrash';
 import ExportGitHubModal from './ExportGitHubModal';
 import { FeedbackModal } from './FeedbackModal';
 import { ForkServerModal } from './ForkServerModal';
@@ -28,8 +28,7 @@ import PRModal from './PRModal';
 import SearchDependenciesModal from './SearchDependenciesModal';
 import SelectSandboxModal from './SelectSandboxModal';
 import ShareModal from './ShareModal';
-// eslint-disable-next-line
-import SignInForTemplates from './SignInForTemplates/index.ts';
+import SignInForTemplates from './SignInForTemplates';
 import { StorageManagementModal } from './StorageManagementModal';
 import { SurveyModal } from './SurveyModal';
 import UploadModal from './UploadModal';