From c13371c64887e67a76b08b503cd749ce7677f033 Mon Sep 17 00:00:00 2001
From: Hossein <hahmadia@users.noreply.github.com>
Date: Tue, 9 Nov 2021 17:11:22 -0500
Subject: [PATCH] Fix GH-1690: Default card template on a board template adds a
 card to the template, not the board (#1748)

---
 .../__snapshots__/workspace.test.tsx.snap     |  8 ++++++++
 webapp/src/components/cardDialog.tsx          |  1 +
 webapp/src/components/centerPanel.tsx         |  6 ++++--
 .../components/gallery/galleryCard.test.tsx   |  2 +-
 webapp/src/components/gallery/galleryCard.tsx |  2 +-
 webapp/src/components/kanban/kanbanCard.tsx   |  1 +
 webapp/src/mutator.test.ts                    | 19 +++++++++++++++++++
 webapp/src/mutator.ts                         |  3 +++
 8 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/webapp/src/components/__snapshots__/workspace.test.tsx.snap b/webapp/src/components/__snapshots__/workspace.test.tsx.snap
index a684d02de..681bd9c30 100644
--- a/webapp/src/components/__snapshots__/workspace.test.tsx.snap
+++ b/webapp/src/components/__snapshots__/workspace.test.tsx.snap
@@ -598,6 +598,7 @@ exports[`src/components/workspace return workspace and showcard 1`] = `
                 class="KanbanCalculation"
               >
                 <button
+                  title="3"
                   type="button"
                 >
                   <span>
@@ -651,6 +652,7 @@ exports[`src/components/workspace return workspace and showcard 1`] = `
                 class="KanbanCalculation"
               >
                 <button
+                  title="0"
                   type="button"
                 >
                   <span>
@@ -1120,6 +1122,7 @@ exports[`src/components/workspace return workspace readonly and showcard 1`] = `
                 class="KanbanCalculation"
               >
                 <button
+                  title="3"
                   type="button"
                 >
                   <span>
@@ -1152,6 +1155,7 @@ exports[`src/components/workspace return workspace readonly and showcard 1`] = `
                 class="KanbanCalculation"
               >
                 <button
+                  title="0"
                   type="button"
                 >
                   <span>
@@ -1887,6 +1891,7 @@ exports[`src/components/workspace should match snapshot 1`] = `
                 class="KanbanCalculation"
               >
                 <button
+                  title="3"
                   type="button"
                 >
                   <span>
@@ -1940,6 +1945,7 @@ exports[`src/components/workspace should match snapshot 1`] = `
                 class="KanbanCalculation"
               >
                 <button
+                  title="0"
                   type="button"
                 >
                   <span>
@@ -2409,6 +2415,7 @@ exports[`src/components/workspace should match snapshot with readonly 1`] = `
                 class="KanbanCalculation"
               >
                 <button
+                  title="3"
                   type="button"
                 >
                   <span>
@@ -2441,6 +2448,7 @@ exports[`src/components/workspace should match snapshot with readonly 1`] = `
                 class="KanbanCalculation"
               >
                 <button
+                  title="0"
                   type="button"
                 >
                   <span>
diff --git a/webapp/src/components/cardDialog.tsx b/webapp/src/components/cardDialog.tsx
index 93dbdf70e..98e9e3c5a 100644
--- a/webapp/src/components/cardDialog.tsx
+++ b/webapp/src/components/cardDialog.tsx
@@ -48,6 +48,7 @@ const CardDialog = (props: Props): JSX.Element => {
         TelemetryClient.trackEvent(TelemetryCategory, TelemetryActions.AddTemplateFromCard, {board: props.board.id, view: activeView.id, card: props.cardId})
         await mutator.duplicateCard(
             props.cardId,
+            board,
             intl.formatMessage({id: 'Mutator.new-template-from-card', defaultMessage: 'new template from card'}),
             true,
             async (newCardId) => {
diff --git a/webapp/src/components/centerPanel.tsx b/webapp/src/components/centerPanel.tsx
index 0c422c930..19c72a5f6 100644
--- a/webapp/src/components/centerPanel.tsx
+++ b/webapp/src/components/centerPanel.tsx
@@ -211,11 +211,12 @@ class CenterPanel extends React.Component<Props, State> {
     }
 
     private addCardFromTemplate = async (cardTemplateId: string) => {
-        const {activeView} = this.props
+        const {activeView, board} = this.props
 
         mutator.performAsUndoGroup(async () => {
             const [, newCardId] = await mutator.duplicateCard(
                 cardTemplateId,
+                board,
                 this.props.intl.formatMessage({id: 'Mutator.new-card-from-template', defaultMessage: 'new card from template'}),
                 false,
                 async (cardId) => {
@@ -361,6 +362,7 @@ class CenterPanel extends React.Component<Props, State> {
     }
 
     private async duplicateSelectedCards() {
+        const {board} = this.props
         const {selectedCardIds} = this.state
         if (selectedCardIds.length < 1) {
             return
@@ -370,7 +372,7 @@ class CenterPanel extends React.Component<Props, State> {
             for (const cardId of selectedCardIds) {
                 const card = this.props.cards.find((o) => o.id === cardId)
                 if (card) {
-                    mutator.duplicateCard(cardId)
+                    mutator.duplicateCard(cardId, board)
                 } else {
                     Utils.assertFailure(`Selected card not found: ${cardId}`)
                 }
diff --git a/webapp/src/components/gallery/galleryCard.test.tsx b/webapp/src/components/gallery/galleryCard.test.tsx
index df594bd52..42f06d731 100644
--- a/webapp/src/components/gallery/galleryCard.test.tsx
+++ b/webapp/src/components/gallery/galleryCard.test.tsx
@@ -162,7 +162,7 @@ describe('src/components/gallery/GalleryCard', () => {
             userEvent.click(buttonDuplicate)
             expect(container).toMatchSnapshot()
             expect(mockedMutator.duplicateCard).toBeCalledTimes(1)
-            expect(mockedMutator.duplicateCard).toBeCalledWith(card.id)
+            expect(mockedMutator.duplicateCard).toBeCalledWith(card.id, board)
         })
         test('return GalleryCard and copy link', () => {
             const {container} = render(wrapDNDIntl(
diff --git a/webapp/src/components/gallery/galleryCard.tsx b/webapp/src/components/gallery/galleryCard.tsx
index a63eb5fd2..e34354399 100644
--- a/webapp/src/components/gallery/galleryCard.tsx
+++ b/webapp/src/components/gallery/galleryCard.tsx
@@ -93,7 +93,7 @@ const GalleryCard = React.memo((props: Props) => {
                             name={intl.formatMessage({id: 'GalleryCard.duplicate', defaultMessage: 'Duplicate'})}
                             onClick={() => {
                                 TelemetryClient.trackEvent(TelemetryCategory, TelemetryActions.DuplicateCard, {board: board.id, card: card.id})
-                                mutator.duplicateCard(card.id)
+                                mutator.duplicateCard(card.id, board)
                             }}
                         />
                         <Menu.Text
diff --git a/webapp/src/components/kanban/kanbanCard.tsx b/webapp/src/components/kanban/kanbanCard.tsx
index 14d04fd6e..3647dca9a 100644
--- a/webapp/src/components/kanban/kanbanCard.tsx
+++ b/webapp/src/components/kanban/kanbanCard.tsx
@@ -78,6 +78,7 @@ const KanbanCard = React.memo((props: Props) => {
                                 TelemetryClient.trackEvent(TelemetryCategory, TelemetryActions.DuplicateCard, {board: board.id, card: card.id})
                                 mutator.duplicateCard(
                                     card.id,
+                                    board,
                                     'duplicate card',
                                     false,
                                     async (newCardId) => {
diff --git a/webapp/src/mutator.test.ts b/webapp/src/mutator.test.ts
index 3be17e0d6..4a3870ba3 100644
--- a/webapp/src/mutator.test.ts
+++ b/webapp/src/mutator.test.ts
@@ -32,4 +32,23 @@ describe('Mutator', () => {
         // 1 API call should be made as property value DID CHANGE
         expect(FetchMock.fn).toBeCalledTimes(1)
     })
+
+    test('duplicateCard', async () => {
+        const card = TestBlockFactory.createCard()
+        const board = TestBlockFactory.createBoard()
+
+        FetchMock.fn.mockReturnValueOnce(FetchMock.jsonResponse(JSON.stringify([card])))
+        FetchMock.fn.mockReturnValueOnce(FetchMock.jsonResponse(JSON.stringify({})))
+        const [newBlocks, newCardID] = await mutator.duplicateCard(card.id, board)
+
+        expect(newBlocks).toHaveLength(1)
+
+        const duplicatedCard = newBlocks[0]
+        expect(duplicatedCard.type).toBe('card')
+        expect(duplicatedCard.id).toBe(newCardID)
+        expect(duplicatedCard.fields.icon).toBe(card.fields.icon)
+        expect(duplicatedCard.fields.contentOrder).toHaveLength(card.fields.contentOrder.length)
+        expect(duplicatedCard.parentId).toBe(board.id)
+        expect(duplicatedCard.rootId).toBe(board.id)
+    })
 })
diff --git a/webapp/src/mutator.ts b/webapp/src/mutator.ts
index 294b7e0cb..f04f73431 100644
--- a/webapp/src/mutator.ts
+++ b/webapp/src/mutator.ts
@@ -636,6 +636,7 @@ class Mutator {
 
     async duplicateCard(
         cardId: string,
+        board: Board,
         description = 'duplicate card',
         asTemplate = false,
         afterRedo?: (newCardId: string) => Promise<void>,
@@ -661,6 +662,8 @@ class Mutator {
             }
         }
         newCard.fields.isTemplate = asTemplate
+        newCard.rootId = board.id
+        newCard.parentId = board.id
         await this.insertBlocks(
             newBlocks,
             description,