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
Entity copy form (#75002)
Romeo Van Snick323dca5e467c
diff --git a/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx b/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsxindex 9b63996e097..1e445a41613 100644--- a/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx+++ b/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx@@ -7,7 +7,7 @@ import {useCopyDocumentMutation,} from "metabase/api";import { useInitialCollectionId } from "metabase/collections/hooks";-import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";+import { CopyModal } from "metabase/common/components/CopyModal";import { entityTypeForObject } from "metabase/redux/store/entities";const getTitle = (entityObject: any, isShallowCopy: boolean) => {@@ -64,7 +64,7 @@ function CollectionCopyEntityModal({};return (- <EntityCopyModal+ <CopyModaloverwriteOnInitialValuesChangeentityType={entityTypeForObject(entityObject)}entityObject={{diff --git a/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx b/frontend/src/metabase/common/components/CopyDashboardForm/CopyDashboardForm.tsxsimilarity index 100%rename from frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsxrename to frontend/src/metabase/common/components/CopyDashboardForm/CopyDashboardForm.tsxdiff --git a/frontend/src/metabase/common/components/CopyDashboardForm/index.ts b/frontend/src/metabase/common/components/CopyDashboardForm/index.tsnew file mode 100644index 00000000000..51bf89be7c0--- /dev/null+++ b/frontend/src/metabase/common/components/CopyDashboardForm/index.ts@@ -0,0 +1,5 @@+export {+ CopyDashboardFormConnected,+ type CopyDashboardFormProperties,+ type CopyDashboardFormProps,+} from "./CopyDashboardForm";diff --git a/frontend/src/metabase/entities/containers/EntityCopyModal.tsx b/frontend/src/metabase/common/components/CopyModal/CopyModal.tsxsimilarity index 78%rename from frontend/src/metabase/entities/containers/EntityCopyModal.tsxrename to frontend/src/metabase/common/components/CopyModal/CopyModal.tsxindex 84f8ce27c2f..4c4426d2817 100644--- a/frontend/src/metabase/entities/containers/EntityCopyModal.tsx+++ b/frontend/src/metabase/common/components/CopyModal/CopyModal.tsx@@ -2,23 +2,15 @@ import { dissoc } from "icepick";import { t } from "ttag";import { useGetDefaultCollectionId } from "metabase/collections/hooks";+import { CopyDashboardFormConnected } from "metabase/common/components/CopyDashboardForm";import { useEscapeToCloseModal } from "metabase/common/hooks/use-escape-to-close-modal";-import { CopyDashboardFormConnected } from "metabase/dashboard/containers/CopyDashboardForm";import { DocumentCopyForm } from "metabase/documents/components/DocumentCopyForm/DocumentCopyForm";import { CopyCardForm } from "metabase/questions/components/CopyCardForm/CopyCardForm";import { Modal } from "metabase/ui";-import type {- CopyableEntityType,- EntityCopyModalProps,- GenericEntityCopyModalProps,-} from "./EntityCopyModal.types";+import type { CopyModalProps } from "./types";-function EntityCopyModal<T extends CopyableEntityType>(- props: EntityCopyModalProps<T>,-): React.JSX.Element;-function EntityCopyModal(props: GenericEntityCopyModalProps): React.JSX.Element;-function EntityCopyModal(props: GenericEntityCopyModalProps) {+export function CopyModal(props: CopyModalProps) {const {entityType,entityObject,@@ -87,6 +79,3 @@ function EntityCopyModal(props: GenericEntityCopyModalProps) {</Modal>);}--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default EntityCopyModal;diff --git a/frontend/src/metabase/common/components/CopyModal/index.ts b/frontend/src/metabase/common/components/CopyModal/index.tsnew file mode 100644index 00000000000..33d76bbabd0--- /dev/null+++ b/frontend/src/metabase/common/components/CopyModal/index.ts@@ -0,0 +1,2 @@+export { CopyModal } from "./CopyModal";+export type * from "./types";diff --git a/frontend/src/metabase/common/components/CopyModal/types.ts b/frontend/src/metabase/common/components/CopyModal/types.tsnew file mode 100644index 00000000000..d425248eb0c--- /dev/null+++ b/frontend/src/metabase/common/components/CopyModal/types.ts@@ -0,0 +1,10 @@+export interface CopyModalProps {+ entityType: string | undefined;+ entityObject: any;+ copy: (data: any) => Promise<any>;+ title?: string;+ onClose: () => void;+ onSaved: (newEntity?: any) => void;+ overwriteOnInitialValuesChange?: boolean;+ onValuesChange?: (values: any) => void;+}diff --git a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsxindex d4cf864f7c4..a036b05f810 100644--- a/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardCopyModal.tsx@@ -6,8 +6,8 @@ import { t } from "ttag";import { useCopyDashboardMutation } from "metabase/api";import { useInitialCollectionId } from "metabase/collections/hooks";-import type { CopyDashboardFormProperties } from "metabase/dashboard/containers/CopyDashboardForm";-import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";+import type { CopyDashboardFormProperties } from "metabase/common/components/CopyDashboardForm";+import { CopyModal } from "metabase/common/components/CopyModal";import { useDispatch, useSelector } from "metabase/redux";import * as Urls from "metabase/urls";import type { Dashboard } from "metabase-types/api";@@ -59,7 +59,7 @@ const DashboardCopyModal = ({};return (- <EntityCopyModal+ <CopyModalentityType="dashboards"entityObject={{...dashboard,diff --git a/frontend/src/metabase/documents/components/DocumentPage.tsx b/frontend/src/metabase/documents/components/DocumentPage.tsxindex 08441e3692e..a699ded1f3f 100644--- a/frontend/src/metabase/documents/components/DocumentPage.tsx+++ b/frontend/src/metabase/documents/components/DocumentPage.tsx@@ -30,6 +30,7 @@ import {} from "metabase/api";import { canonicalCollectionId } from "metabase/collections/utils";import { ConfirmModal } from "metabase/common/components/ConfirmModal";+import { CopyModal } from "metabase/common/components/CopyModal";import {LeaveConfirmModal,LeaveRouteConfirmModal,@@ -37,7 +38,6 @@ import {import { CollectionPickerModal } from "metabase/common/components/Pickers/CollectionPicker";import { useToast } from "metabase/common/hooks";import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";-import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch, useSelector } from "metabase/redux";import { setErrorPage } from "metabase/redux/app";@@ -545,7 +545,7 @@ export const DocumentPage = ({)}{duplicateModalMode === "duplicate" && documentData && (- <EntityCopyModal+ <CopyModalentityType="documents"onClose={() => setDuplicateModalMode(null)}onSaved={(document) => {diff --git a/frontend/src/metabase/entities/containers/EntityCopyModal.types.ts b/frontend/src/metabase/entities/containers/EntityCopyModal.types.tsdeleted file mode 100644index 1813706b592..00000000000--- a/frontend/src/metabase/entities/containers/EntityCopyModal.types.ts+++ /dev/null@@ -1,59 +0,0 @@-import type { CopyDashboardFormProperties } from "metabase/dashboard/containers/CopyDashboardForm";-import type { CopyDocumentProperties } from "metabase/documents/components/DocumentCopyForm/DocumentCopyForm";-import type { CopyCardProperties } from "metabase/questions/components/CopyCardForm/CopyCardForm";-import type { Card, Dashboard } from "metabase-types/api";-import type { Document } from "metabase-types/api/document";--/**- * Registry mapping entityType strings to their form properties and entity types.- * To add a new entity type, extend this interface.- */-export interface EntityCopyTypeRegistry {- dashboards: {- formProperties: CopyDashboardFormProperties;- entity: Dashboard;- };- cards: {- formProperties: CopyCardProperties;- entity: Card;- };- documents: {- formProperties: CopyDocumentProperties;- entity: Document;- };-}--export type CopyableEntityType = keyof EntityCopyTypeRegistry;--export interface EntityCopyModalProps<T extends CopyableEntityType> {- entityType: T;- entityObject: EntityCopyTypeRegistry[T]["entity"];- copy: (- data: EntityCopyTypeRegistry[T]["formProperties"],- ) => Promise<EntityCopyTypeRegistry[T]["entity"]>;- title?: string;- onClose: () => void;- onSaved: (newEntity: EntityCopyTypeRegistry[T]["entity"]) => void;- overwriteOnInitialValuesChange?: boolean;- onValuesChange?: (- values: EntityCopyTypeRegistry[T]["formProperties"],- ) => void;-}--/**- * Generic fallback props used by the implementation signature.- *- * Call sites should prefer the typed overloads using `EntityCopyModalProps<T>`.- * The implementation stays broadly typed to avoid overly complex unions while- * still being safe in practice (forms validate their own values).- */-export interface GenericEntityCopyModalProps {- entityType: string | undefined;- entityObject: any;- copy: (data: any) => Promise<any>;- title?: string;- onClose: () => void;- onSaved: (newEntity?: any) => void;- overwriteOnInitialValuesChange?: boolean;- onValuesChange?: (values: any) => void;-}diff --git a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsxindex 1be61f2d15a..52698d20630 100644--- a/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx+++ b/frontend/src/metabase/query_builder/components/QueryModals/QueryModals.tsx@@ -5,12 +5,12 @@ import _ from "underscore";import { getDashboard } from "metabase/api";import { useGetDefaultCollectionId } from "metabase/collections/hooks";+import { CopyModal } from "metabase/common/components/CopyModal";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";-import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";import { QuestionAlertListModal } from "metabase/notifications/modals";import { setArchivedQuestion } from "metabase/query_builder/actions";import { ImpossibleToCreateModelModal } from "metabase/query_builder/components/ImpossibleToCreateModelModal";@@ -236,7 +236,7 @@ export function QueryModals({);case MODAL_TYPES.CLONE:return (- <EntityCopyModal+ <CopyModalentityType="cards"entityObject={{...question.card(),@@ -246,7 +246,7 @@ export function QueryModals({}}copy={async (formValues) => {if (!underlyingQuestion) {- return;+ throw new Error(t`Unable to duplicate this question.`);}const question = underlyingQuestiondiff --git a/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsx b/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsxindex 23d6f452ad2..08845ecc168 100644--- a/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsx+++ b/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsx@@ -3,7 +3,7 @@ import { useLatest } from "react-use";import { useCreateCardMutation } from "metabase/api";import { useGetDefaultCollectionId } from "metabase/collections/hooks";-import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";+import { CopyModal } from "metabase/common/components/CopyModal";import type { CopyCardProperties } from "metabase/questions/components/CopyCardForm";import type { Card } from "metabase-types/api";@@ -45,7 +45,7 @@ export function CardCopyModal({ card, onCopy, onClose }: CardCopyModalProps) {};return (- <EntityCopyModal+ <CopyModalentityType="cards"entityObject={initialValues}copy={handleCopy}