The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Move AddToDashSelectDashModal into common (#74051)
Fraser21aeddfa56d1
diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjsindex f9059494e2c..3a0bf78c2d8 100644--- a/frontend/lint/module-boundaries.mjs+++ b/frontend/lint/module-boundaries.mjs@@ -75,6 +75,7 @@ const elements = [createElement({ type: "shared", name: "hooks", enforceOutgoing: true }),createElement({ type: "shared", name: "i18n", enforceOutgoing: true }),createElement({ type: "shared", name: "metadata", enforceOutgoing: true }),+ createElement({ type: "shared", name: "metrics", enforceOutgoing: true }),createElement({type: "shared",name: "metrics-viewer",diff --git a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsxsimilarity index 93%rename from frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsxrename to frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsxindex 569240021f4..45564a73718 100644--- a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx+++ b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.tsx@@ -1,12 +1,6 @@import { useCallback, useMemo } from "react";import { t } from "ttag";-import {- type OmniPickerItem,- isInDbTree,-} from "metabase/common/components/Pickers";-import { DashboardPickerModal } from "metabase/common/components/Pickers/DashboardPicker";-import { getCollectionType } from "metabase/common/components/Pickers/EntityPicker/utils";import { canPlaceEntityInCollectionOrDescendants } from "metabase/data-studio/utils";import { ROOT_COLLECTION } from "metabase/entities/collections";import { useSelector } from "metabase/redux";@@ -14,6 +8,10 @@ import { getUserPersonalCollectionId } from "metabase/selectors/user";import * as Urls from "metabase/urls";import type { Card, Dashboard } from "metabase-types/api";+import { DashboardPickerModal } from "../DashboardPicker";+import { type OmniPickerItem, isInDbTree } from "../EntityPicker";+import { getCollectionType } from "../EntityPicker/utils";+import { useMostRecentlyViewedDashboard } from "./hooks";import { isInPersonalCollection } from "./utils";diff --git a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsx b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsxsimilarity index 100%rename from frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsxrename to frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/AddToDashSelectDashModal.unit.spec.tsxdiff --git a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/hooks.ts b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/hooks.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/hooks.tsrename to frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/hooks.tsdiff --git a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/index.ts b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/index.tssimilarity index 100%rename from frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/index.tsrename to frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/index.tsdiff --git a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/utils.ts b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/utils.tssimilarity index 84%rename from frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/utils.tsrename to frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/utils.tsindex 3e85138178c..7a1f0cd5a34 100644--- a/frontend/src/metabase/query_builder/components/AddToDashSelectDashModal/utils.ts+++ b/frontend/src/metabase/common/components/Pickers/AddToDashSelectDashModal/utils.ts@@ -1,6 +1,7 @@-import type { OmniPickerItem } from "metabase/common/components/Pickers";import type { CollectionId } from "metabase-types/api";+import type { OmniPickerItem } from "../EntityPicker";+export const isInPersonalCollection = (dash: OmniPickerItem,personalCollectionId: CollectionId,diff --git a/frontend/src/metabase/common/components/Pickers/index.ts b/frontend/src/metabase/common/components/Pickers/index.tsindex 98b14fcdc5c..ecdd6bc66cb 100644--- a/frontend/src/metabase/common/components/Pickers/index.ts+++ b/frontend/src/metabase/common/components/Pickers/index.ts@@ -1,4 +1,5 @@export * from "./EntityPicker";+export { AddToDashSelectDashModal } from "./AddToDashSelectDashModal";export { CollectionPickerModal } from "./CollectionPicker";export { DashboardPickerModal } from "./DashboardPicker";export { DataPickerModal } from "./DataPicker";diff --git a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsxindex f4e748aa3dc..015c2c1d8e8 100644--- a/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx+++ b/frontend/src/metabase/metrics/components/MetricHeader/MetricToolbar/MetricToolbar.tsx@@ -9,6 +9,7 @@ import {useListNotificationsQuery,} from "metabase/api";import { ForwardRefLink } from "metabase/common/components/Link";+import { AddToDashSelectDashModal } from "metabase/common/components/Pickers/AddToDashSelectDashModal";import { ToolbarButton } from "metabase/common/components/ToolbarButton";import { canAccessDataStudio as canAccessDataStudioSelector } from "metabase/data-studio/selectors";import { isNumericMetric } from "metabase/metrics/utils/validation";@@ -18,7 +19,6 @@ import {PLUGIN_LIBRARY,PLUGIN_MODERATION,} from "metabase/plugins";-import { AddToDashSelectDashModal } from "metabase/query_builder/components/AddToDashSelectDashModal";import { ArchiveCardModal } from "metabase/questions/components/ArchiveCardModal";import { CardCopyModal } from "metabase/questions/components/CardCopyModal";import { MoveCardModal } from "metabase/questions/components/MoveCardModal";diff --git a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsxindex cf32e1d9d39..5b429ca6204 100644--- a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx+++ b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx@@ -6,6 +6,7 @@ import _ from "underscore";import { getDashboard } from "metabase/api";import { useGetDefaultCollectionId } from "metabase/collections/hooks";import { Modal } from "metabase/common/components/Modal";+import { AddToDashSelectDashModal } from "metabase/common/components/Pickers/AddToDashSelectDashModal";import { SaveQuestionModal } from "metabase/common/components/SaveQuestionModal";import { type ToastArgs, useToast } from "metabase/common/hooks";import { QuestionEmbedWidget } from "metabase/embedding/components/QuestionEmbedWidget";@@ -29,8 +30,6 @@ import * as Urls from "metabase/urls";import Question from "metabase-lib/v1/Question";import type { Card, DashboardTabId } from "metabase-types/api";-import { AddToDashSelectDashModal } from "../AddToDashSelectDashModal";-type OnCreateOptions = { dashboardTabId?: DashboardTabId | undefined };interface QueryModalsProps {