From d55615cf29619e416bd8c24bcf5b1b3115c7cff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Thu, 26 Sep 2019 11:24:24 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=A8=20Switch=20DeleteSandboxModal?= =?UTF-8?q?=20to=20use=20useOvermind?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/Modals/DeleteSandboxModal/index.js | 16 ------------- .../Modals/DeleteSandboxModal/index.tsx | 24 +++++++++++++++++++ 2 files changed, 24 insertions(+), 16 deletions(-) delete mode 100644 packages/app/src/app/pages/common/Modals/DeleteSandboxModal/index.js create mode 100644 packages/app/src/app/pages/common/Modals/DeleteSandboxModal/index.tsx diff --git a/packages/app/src/app/pages/common/Modals/DeleteSandboxModal/index.js b/packages/app/src/app/pages/common/Modals/DeleteSandboxModal/index.js deleted file mode 100644 index 5f4738ec038..00000000000 --- a/packages/app/src/app/pages/common/Modals/DeleteSandboxModal/index.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from 'react'; -import { Alert } from 'app/components/Alert'; -import { inject, hooksObserver } from 'app/componentConnectors'; - -function DeleteSandboxModal({ signals }) { - return ( - Are you sure you want to delete this sandbox?} - onCancel={() => signals.modalClosed()} - onConfirm={() => signals.workspace.sandboxDeleted()} - /> - ); -} - -export default inject('signals')(hooksObserver(DeleteSandboxModal)); diff --git a/packages/app/src/app/pages/common/Modals/DeleteSandboxModal/index.tsx b/packages/app/src/app/pages/common/Modals/DeleteSandboxModal/index.tsx new file mode 100644 index 00000000000..38c4571bdf0 --- /dev/null +++ b/packages/app/src/app/pages/common/Modals/DeleteSandboxModal/index.tsx @@ -0,0 +1,24 @@ +import React, { FunctionComponent } from 'react'; + +import { Alert } from 'app/components/Alert'; +import { useOvermind } from 'app/overmind'; + +const DeleteSandboxModal: FunctionComponent = () => { + const { + actions: { + modalClosed, + workspace: { sandboxDeleted }, + }, + } = useOvermind(); + + return ( + Are you sure you want to delete this sandbox?} + onCancel={() => modalClosed()} + onConfirm={() => sandboxDeleted()} + /> + ); +}; + +export default DeleteSandboxModal; From 5eb0d13a0379cae9bf1e29a6f9b210377232a9e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Thu, 26 Sep 2019 16:01:41 +0200 Subject: [PATCH 2/2] Fix types --- .../src/app/pages/common/Modals/DeleteSandboxModal/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/src/app/pages/common/Modals/DeleteSandboxModal/index.tsx b/packages/app/src/app/pages/common/Modals/DeleteSandboxModal/index.tsx index 38c4571bdf0..580deefcd3a 100644 --- a/packages/app/src/app/pages/common/Modals/DeleteSandboxModal/index.tsx +++ b/packages/app/src/app/pages/common/Modals/DeleteSandboxModal/index.tsx @@ -14,7 +14,7 @@ const DeleteSandboxModal: FunctionComponent = () => { return ( Are you sure you want to delete this sandbox?} + body="Are you sure you want to delete this sandbox?" onCancel={() => modalClosed()} onConfirm={() => sandboxDeleted()} />