Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Consolidate question-timeline UI into query_builder (#77256)

Fraser3127b4e8c333
diff --git a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx
index 0abab29169a..b249d94131b 100644
--- a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx
+++ b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx
@@ -15,6 +15,9 @@ import { setArchivedQuestion } from "metabase/query_builder/actions";
import { updateUrl } from "metabase/query_builder/actions/url";
import { ImpossibleToCreateModelModal } from "metabase/query_builder/components/ImpossibleToCreateModelModal";
import { NewDatasetModal } from "metabase/query_builder/components/NewDatasetModal";
+import EditEventModal from "metabase/query_builder/components/timelines/containers/EditEventModal";
+import MoveEventModal from "metabase/query_builder/components/timelines/containers/MoveEventModal";
+import NewEventModal from "metabase/query_builder/components/timelines/containers/NewEventModal";
import { PreviewQueryModal } from "metabase/query_builder/components/view/PreviewQueryModal";
import {
getQuestionWithoutComposing,
@@ -25,9 +28,6 @@ import { ArchiveCardModal } from "metabase/questions/components/ArchiveCardModal
import { MoveCardModal } from "metabase/questions/components/MoveCardModal";
import { useDispatch, useSelector } from "metabase/redux";
import type { QueryBuilderMode } from "metabase/redux/store";
-import EditEventModal from "metabase/timelines/questions/containers/EditEventModal";
-import MoveEventModal from "metabase/timelines/questions/containers/MoveEventModal";
-import NewEventModal from "metabase/timelines/questions/containers/NewEventModal";
import { Modal, Text } from "metabase/ui";
import * as Urls from "metabase/urls";
import Question from "metabase-lib/v1/Question";
diff --git a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.styled.tsx b/frontend/src/metabase/query_builder/components/timelines/components/EventCard/EventCard.styled.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/EventCard/EventCard.styled.tsx
rename to frontend/src/metabase/query_builder/components/timelines/components/EventCard/EventCard.styled.tsx
diff --git a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.tsx b/frontend/src/metabase/query_builder/components/timelines/components/EventCard/EventCard.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/EventCard/EventCard.tsx
rename to frontend/src/metabase/query_builder/components/timelines/components/EventCard/EventCard.tsx
diff --git a/frontend/src/metabase/timelines/questions/components/EventCard/EventCard.unit.spec.tsx b/frontend/src/metabase/query_builder/components/timelines/components/EventCard/EventCard.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/EventCard/EventCard.unit.spec.tsx
rename to frontend/src/metabase/query_builder/components/timelines/components/EventCard/EventCard.unit.spec.tsx
diff --git a/frontend/src/metabase/timelines/questions/components/EventCard/index.ts b/frontend/src/metabase/query_builder/components/timelines/components/EventCard/index.ts
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/EventCard/index.ts
rename to frontend/src/metabase/query_builder/components/timelines/components/EventCard/index.ts
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.styled.tsx b/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.styled.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.styled.tsx
rename to frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.styled.tsx
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.tsx b/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.tsx
rename to frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.tsx
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.unit.spec.tsx b/frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/TimelineCard/TimelineCard.unit.spec.tsx
rename to frontend/src/metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard.unit.spec.tsx
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsx b/frontend/src/metabase/query_builder/components/timelines/components/TimelineEmptyState/TimelineEmptyState.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.tsx
rename to frontend/src/metabase/query_builder/components/timelines/components/TimelineEmptyState/TimelineEmptyState.tsx
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.unit.spec.tsx b/frontend/src/metabase/query_builder/components/timelines/components/TimelineEmptyState/TimelineEmptyState.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/TimelineEmptyState/TimelineEmptyState.unit.spec.tsx
rename to frontend/src/metabase/query_builder/components/timelines/components/TimelineEmptyState/TimelineEmptyState.unit.spec.tsx
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineEmptyState/index.ts b/frontend/src/metabase/query_builder/components/timelines/components/TimelineEmptyState/index.ts
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/TimelineEmptyState/index.ts
rename to frontend/src/metabase/query_builder/components/timelines/components/TimelineEmptyState/index.ts
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineList/TimelineList.tsx b/frontend/src/metabase/query_builder/components/timelines/components/TimelineList/TimelineList.tsx
similarity index 93%
rename from frontend/src/metabase/timelines/questions/components/TimelineList/TimelineList.tsx
rename to frontend/src/metabase/query_builder/components/timelines/components/TimelineList/TimelineList.tsx
index 70216ccf9c9..d5843111cea 100644
--- a/frontend/src/metabase/timelines/questions/components/TimelineList/TimelineList.tsx
+++ b/frontend/src/metabase/query_builder/components/timelines/components/TimelineList/TimelineList.tsx
@@ -1,4 +1,4 @@
-import TimelineCard from "metabase/timelines/questions/components/TimelineCard/TimelineCard";
+import TimelineCard from "metabase/query_builder/components/timelines/components/TimelineCard/TimelineCard";
import type { Timeline, TimelineEvent } from "metabase-types/api";
export interface TimelineListProps {
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineList/TimelineList.unit.spec.tsx b/frontend/src/metabase/query_builder/components/timelines/components/TimelineList/TimelineList.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/TimelineList/TimelineList.unit.spec.tsx
rename to frontend/src/metabase/query_builder/components/timelines/components/TimelineList/TimelineList.unit.spec.tsx
diff --git a/frontend/src/metabase/timelines/questions/components/TimelineList/index.ts b/frontend/src/metabase/query_builder/components/timelines/components/TimelineList/index.ts
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/TimelineList/index.ts
rename to frontend/src/metabase/query_builder/components/timelines/components/TimelineList/index.ts
diff --git a/frontend/src/metabase/timelines/questions/components/TimelinePanel/TimelinePanel.tsx b/frontend/src/metabase/query_builder/components/timelines/components/TimelinePanel/TimelinePanel.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/TimelinePanel/TimelinePanel.tsx
rename to frontend/src/metabase/query_builder/components/timelines/components/TimelinePanel/TimelinePanel.tsx
diff --git a/frontend/src/metabase/timelines/questions/components/TimelinePanel/TimelinePanel.unit.spec.tsx b/frontend/src/metabase/query_builder/components/timelines/components/TimelinePanel/TimelinePanel.unit.spec.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/TimelinePanel/TimelinePanel.unit.spec.tsx
rename to frontend/src/metabase/query_builder/components/timelines/components/TimelinePanel/TimelinePanel.unit.spec.tsx
diff --git a/frontend/src/metabase/timelines/questions/components/TimelinePanel/index.ts b/frontend/src/metabase/query_builder/components/timelines/components/TimelinePanel/index.ts
similarity index 100%
rename from frontend/src/metabase/timelines/questions/components/TimelinePanel/index.ts
rename to frontend/src/metabase/query_builder/components/timelines/components/TimelinePanel/index.ts
diff --git a/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/query_builder/components/timelines/containers/EditEventModal/EditEventModal.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx
rename to frontend/src/metabase/query_builder/components/timelines/containers/EditEventModal/EditEventModal.tsx
diff --git a/frontend/src/metabase/timelines/questions/containers/EditEventModal/index.ts b/frontend/src/metabase/query_builder/components/timelines/containers/EditEventModal/index.ts
similarity index 100%
rename from frontend/src/metabase/timelines/questions/containers/EditEventModal/index.ts
rename to frontend/src/metabase/query_builder/components/timelines/containers/EditEventModal/index.ts
diff --git a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/query_builder/components/timelines/containers/MoveEventModal/MoveEventModal.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx
rename to frontend/src/metabase/query_builder/components/timelines/containers/MoveEventModal/MoveEventModal.tsx
diff --git a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/index.ts b/frontend/src/metabase/query_builder/components/timelines/containers/MoveEventModal/index.ts
similarity index 100%
rename from frontend/src/metabase/timelines/questions/containers/MoveEventModal/index.ts
rename to frontend/src/metabase/query_builder/components/timelines/containers/MoveEventModal/index.ts
diff --git a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/query_builder/components/timelines/containers/NewEventModal/NewEventModal.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx
rename to frontend/src/metabase/query_builder/components/timelines/containers/NewEventModal/NewEventModal.tsx
diff --git a/frontend/src/metabase/timelines/questions/containers/NewEventModal/index.ts b/frontend/src/metabase/query_builder/components/timelines/containers/NewEventModal/index.ts
similarity index 100%
rename from frontend/src/metabase/timelines/questions/containers/NewEventModal/index.ts
rename to frontend/src/metabase/query_builder/components/timelines/containers/NewEventModal/index.ts
diff --git a/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx b/frontend/src/metabase/query_builder/components/timelines/containers/TimelinePanel/TimelinePanel.tsx
similarity index 100%
rename from frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx
rename to frontend/src/metabase/query_builder/components/timelines/containers/TimelinePanel/TimelinePanel.tsx
diff --git a/frontend/src/metabase/timelines/questions/containers/TimelinePanel/index.ts b/frontend/src/metabase/query_builder/components/timelines/containers/TimelinePanel/index.ts
similarity index 100%
rename from frontend/src/metabase/timelines/questions/containers/TimelinePanel/index.ts
rename to frontend/src/metabase/query_builder/components/timelines/containers/TimelinePanel/index.ts
diff --git a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx
index e9452c265be..13d5a4cf9ed 100644
--- a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx
+++ b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/QuestionTimelineWidget.tsx
@@ -1,6 +1,6 @@
import { t } from "ttag";
-import { ViewFooterButton } from "metabase/common/components/ViewFooterButton";
+import { ViewFooterButton } from "metabase/query_builder/components/view/ViewFooterButton";
import { getUiControls } from "metabase/query_builder/selectors";
import { useDispatch, useSelector } from "metabase/redux";
import {
diff --git a/frontend/src/metabase/common/components/ViewFooterButton/ViewFooterButton.tsx b/frontend/src/metabase/query_builder/components/view/ViewFooterButton/ViewFooterButton.tsx
similarity index 100%
rename from frontend/src/metabase/common/components/ViewFooterButton/ViewFooterButton.tsx
rename to frontend/src/metabase/query_builder/components/view/ViewFooterButton/ViewFooterButton.tsx
diff --git a/frontend/src/metabase/common/components/ViewFooterButton/index.ts b/frontend/src/metabase/query_builder/components/view/ViewFooterButton/index.ts
similarity index 100%
rename from frontend/src/metabase/common/components/ViewFooterButton/index.ts
rename to frontend/src/metabase/query_builder/components/view/ViewFooterButton/index.ts
diff --git a/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx b/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx
index e8e6cbae8d8..c4f8fe9fe59 100644
--- a/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx
+++ b/frontend/src/metabase/query_builder/components/view/sidebars/TimelineSidebar/TimelineSidebar.tsx
@@ -3,8 +3,8 @@ import { useCallback } from "react";
import { t } from "ttag";
import { SidebarContent } from "metabase/common/components/SidebarContent";
+import TimelinePanel from "metabase/query_builder/components/timelines/containers/TimelinePanel";
import { MODAL_TYPES, type QueryModalType } from "metabase/querying/constants";
-import TimelinePanel from "metabase/timelines/questions/containers/TimelinePanel";
import type Question from "metabase-lib/v1/Question";
import type { Timeline, TimelineEvent } from "metabase-types/api";