Skip to content

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

UXW-2352 Fix issue where CopyCardForm resets when the destination collection is changed (#66275)

Brad Anderson39dfac795ef4
diff --git a/e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts b/e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts
index b02d777ed1c..aa104749469 100644
--- a/e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/modeling-metrics.cy.spec.ts
@@ -304,7 +304,7 @@ describe("scenarios > data studio > modeling > metrics", () => {
.and("match", /\/metric\/\d+/);
});
- it.skip("should duplicate metric via more menu", () => {
+ it("should duplicate metric via more menu", () => {
cy.log("Navigate to Data Studio Modeling");
cy.visit("/data-studio/modeling");
@@ -346,6 +346,7 @@ describe("scenarios > data studio > modeling > metrics", () => {
H.modal().button("Duplicate").click();
cy.wait("@createCard");
+ H.modal().should("not.exist");
cy.log("Verify duplicate metric is created");
H.DataStudio.Metrics.overviewPage()
diff --git a/e2e/test/scenarios/data-studio/modeling-models.cy.spec.ts b/e2e/test/scenarios/data-studio/modeling-models.cy.spec.ts
index 6013e255890..d064e601f02 100644
--- a/e2e/test/scenarios/data-studio/modeling-models.cy.spec.ts
+++ b/e2e/test/scenarios/data-studio/modeling-models.cy.spec.ts
@@ -184,7 +184,7 @@ describe("scenarios > data studio > modeling > models", () => {
.and("match", /\/model\/\d+/);
});
- it.skip("should duplicate model via more menu", () => {
+ it("should duplicate model via more menu", () => {
cy.log("Navigate to Data Studio Modeling");
cy.visit("/data-studio/modeling");
@@ -224,6 +224,7 @@ describe("scenarios > data studio > modeling > models", () => {
H.modal().button("Duplicate").click();
cy.wait("@createCard");
+ H.modal().should("not.exist");
cy.log("Verify duplicate model is created");
H.DataStudio.Models.overviewPage()
diff --git a/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsx b/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsx
index 1b9169db7a5..23d6f452ad2 100644
--- a/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsx
+++ b/frontend/src/metabase/questions/components/CardCopyModal/CardCopyModal.tsx
@@ -1,4 +1,5 @@
import { useMemo } from "react";
+import { useLatest } from "react-use";
import { useCreateCardMutation } from "metabase/api";
import { useGetDefaultCollectionId } from "metabase/collections/hooks";
@@ -16,12 +17,15 @@ export function CardCopyModal({ card, onCopy, onClose }: CardCopyModalProps) {
const [createCard] = useCreateCardMutation();
const initialCollectionId = useGetDefaultCollectionId();
+ const cardRef = useLatest(card);
const initialValues = useMemo(
() => ({
- ...card,
- collection_id: card.can_write ? card.collection_id : initialCollectionId,
+ ...cardRef.current,
+ collection_id: cardRef.current.can_write
+ ? cardRef.current.collection_id
+ : initialCollectionId,
}),
- [card, initialCollectionId],
+ [cardRef, initialCollectionId],
);
const handleCopy = async (values: CopyCardProperties) => {
@@ -36,6 +40,7 @@ export function CardCopyModal({ card, onCopy, onClose }: CardCopyModalProps) {
};
const handleCopySucceeded = (newCard: Card) => {
+ onClose();
onCopy?.(newCard);
};