From 74de573dd175d8cdb0a8500b539e97bb2126975e Mon Sep 17 00:00:00 2001 From: Anton Kulyk <kuliks.anton@gmail.com> Date: Tue, 10 Jan 2023 12:14:46 +0000 Subject: [PATCH] Extract question components to questions module (#27605) * Move out `ArchiveQuestionModal` * Move out `QuestionMoveToast` --- .../src/metabase/query_builder/components/QueryModals.jsx | 4 ++-- .../QuestionMoveToast/QuestionMoveToast.styled.tsx | 0 .../components/QuestionMoveToast/QuestionMoveToast.tsx | 7 +++---- .../components/QuestionMoveToast/index.ts | 0 .../containers/ArchiveQuestionModal.jsx | 0 5 files changed, 5 insertions(+), 6 deletions(-) rename frontend/src/metabase/{query_builder => questions}/components/QuestionMoveToast/QuestionMoveToast.styled.tsx (100%) rename frontend/src/metabase/{query_builder => questions}/components/QuestionMoveToast/QuestionMoveToast.tsx (88%) rename frontend/src/metabase/{query_builder => questions}/components/QuestionMoveToast/index.ts (100%) rename frontend/src/metabase/{query_builder => questions}/containers/ArchiveQuestionModal.jsx (100%) diff --git a/frontend/src/metabase/query_builder/components/QueryModals.jsx b/frontend/src/metabase/query_builder/components/QueryModals.jsx index 1932a7a4e09..bf79fef66c5 100644 --- a/frontend/src/metabase/query_builder/components/QueryModals.jsx +++ b/frontend/src/metabase/query_builder/components/QueryModals.jsx @@ -17,7 +17,7 @@ import QuestionSavedModal from "metabase/components/QuestionSavedModal"; import AddToDashSelectDashModal from "metabase/containers/AddToDashSelectDashModal"; import CollectionMoveModal from "metabase/containers/CollectionMoveModal"; -import ArchiveQuestionModal from "metabase/query_builder/containers/ArchiveQuestionModal"; +import ArchiveQuestionModal from "metabase/questions/containers/ArchiveQuestionModal"; import QuestionEmbedWidget from "metabase/query_builder/containers/QuestionEmbedWidget"; import QuestionHistoryModal from "metabase/query_builder/containers/QuestionHistoryModal"; @@ -31,7 +31,7 @@ import EditEventModal from "metabase/timelines/questions/containers/EditEventMod import MoveEventModal from "metabase/timelines/questions/containers/MoveEventModal"; import PreviewQueryModal from "metabase/query_builder/components/view/PreviewQueryModal"; import ConvertQueryModal from "metabase/query_builder/components/view/ConvertQueryModal"; -import QuestionMoveToast from "./QuestionMoveToast"; +import QuestionMoveToast from "metabase/questions/components/QuestionMoveToast"; const mapDispatchToProps = { setQuestionCollection: Questions.actions.setCollection, diff --git a/frontend/src/metabase/query_builder/components/QuestionMoveToast/QuestionMoveToast.styled.tsx b/frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.styled.tsx similarity index 100% rename from frontend/src/metabase/query_builder/components/QuestionMoveToast/QuestionMoveToast.styled.tsx rename to frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.styled.tsx diff --git a/frontend/src/metabase/query_builder/components/QuestionMoveToast/QuestionMoveToast.tsx b/frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.tsx similarity index 88% rename from frontend/src/metabase/query_builder/components/QuestionMoveToast/QuestionMoveToast.tsx rename to frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.tsx index 8faf35fe53e..d5dcc022262 100644 --- a/frontend/src/metabase/query_builder/components/QuestionMoveToast/QuestionMoveToast.tsx +++ b/frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.tsx @@ -11,10 +11,7 @@ interface QuestionMoveToastProps { collectionId: number; } -export default function QuestionMoveToast({ - isModel, - collectionId, -}: QuestionMoveToastProps) { +function QuestionMoveToast({ isModel, collectionId }: QuestionMoveToastProps) { return ( <ToastRoot> <StyledIcon name="all" color="white" /> @@ -38,3 +35,5 @@ export default function QuestionMoveToast({ </ToastRoot> ); } + +export default QuestionMoveToast; diff --git a/frontend/src/metabase/query_builder/components/QuestionMoveToast/index.ts b/frontend/src/metabase/questions/components/QuestionMoveToast/index.ts similarity index 100% rename from frontend/src/metabase/query_builder/components/QuestionMoveToast/index.ts rename to frontend/src/metabase/questions/components/QuestionMoveToast/index.ts diff --git a/frontend/src/metabase/query_builder/containers/ArchiveQuestionModal.jsx b/frontend/src/metabase/questions/containers/ArchiveQuestionModal.jsx similarity index 100% rename from frontend/src/metabase/query_builder/containers/ArchiveQuestionModal.jsx rename to frontend/src/metabase/questions/containers/ArchiveQuestionModal.jsx -- GitLab