From e436cb921a04c7c5956c92c2bbb88184b0a16eb7 Mon Sep 17 00:00:00 2001
From: grnd-alt <salimbelakkaf@outlook.de>
Date: Tue, 29 Oct 2024 11:59:52 +0100
Subject: [PATCH 01/12] feat(cards): add card cloning ability

Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>
---
 src/App.vue                              |   3 +
 src/CardCloneDialog.vue                  | 122 +++++++++++++++++++++++
 src/CardMoveDialog.vue                   |   6 +-
 src/components/cards/CardMenuEntries.vue |   9 ++
 4 files changed, 137 insertions(+), 3 deletions(-)
 create mode 100644 src/CardCloneDialog.vue

diff --git a/src/App.vue b/src/App.vue
index f43f6c516..7f68bd18e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,6 +26,7 @@
 		</div>
 		<KeyboardShortcuts />
 		<CardMoveDialog />
+		<CardCloneDialog />
 	</NcContent>
 </template>
 
@@ -38,6 +39,7 @@ import { BoardApi } from './services/BoardApi.js'
 import { emit, subscribe } from '@nextcloud/event-bus'
 import { loadState } from '@nextcloud/initial-state'
 import CardMoveDialog from './CardMoveDialog.vue'
+import CardCloneDialog from './CardCloneDialog.vue'
 
 const boardApi = new BoardApi()
 
@@ -45,6 +47,7 @@ export default {
 	name: 'App',
 	components: {
 		CardMoveDialog,
+		CardCloneDialog,
 		AppNavigation,
 		NcModal,
 		NcContent,
diff --git a/src/CardCloneDialog.vue b/src/CardCloneDialog.vue
new file mode 100644
index 000000000..b0d1b4f27
--- /dev/null
+++ b/src/CardCloneDialog.vue
@@ -0,0 +1,122 @@
+<!--
+  - SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+  - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<template>
+	<NcModal v-if="modalShow" :title="t('deck', 'Clone card')" @close="modalShow = false">
+		<div class="modal__content">
+			<h3>{{ t('deck', 'Clone card to another board') }}</h3>
+			<NcSelect v-model="selectedBoard"
+				:input-label="t('deck', 'Select a board')"
+				:placeholder="t('deck', 'Select a board')"
+				:options="activeBoards"
+				:max-height="100"
+				label="title"
+				@option:selected="loadStacksFromBoard" />
+			<NcSelect v-model="selectedStack"
+				:disabled="stacksFromBoard.length === 0"
+				:placeholder="stacksFromBoard.length === 0 ? t('deck', 'No lists available') : t('deck', 'Select a list')"
+				:input-label="t('deck', 'Select a list')"
+				:options="stacksFromBoard"
+				:max-height="100"
+				label="title" />
+
+			<button :disabled="!isBoardAndStackChoosen" class="primary" @click="moveCard">
+				{{ t('deck', 'Clone card') }}
+			</button>
+			<button @click="modalShow = false">
+				{{ t('deck', 'Cancel') }}
+			</button>
+		</div>
+	</NcModal>
+</template>
+
+<script>
+import { NcModal, NcSelect } from '@nextcloud/vue'
+import { generateUrl } from '@nextcloud/router'
+import axios from '@nextcloud/axios'
+import { subscribe, unsubscribe } from '@nextcloud/event-bus'
+import { mapGetters, mapState } from 'vuex'
+
+export default {
+	name: 'CardCloneDialog',
+	components: { NcModal, NcSelect },
+	data() {
+		return {
+			card: null,
+			modalShow: false,
+			selectedBoard: '',
+			selectedStack: '',
+			stacksFromBoard: [],
+		}
+	},
+	computed: {
+		...mapGetters([
+			'boards',
+			'stackById',
+			'boardById',
+		]),
+		...mapState({
+			currentBoard: state => state.currentBoard,
+		}),
+		activeBoards() {
+			return this.$store.getters.boards.filter((item) => item.deletedAt === 0 && item.archived === false)
+		},
+		isBoardAndStackChoosen() {
+			return !(this.selectedBoard === '' || this.selectedStack === '')
+		},
+	},
+	mounted() {
+		subscribe('deck:card:show-clone-dialog', this.openModal)
+	},
+	destroyed() {
+		unsubscribe('deck:card:show-clone-dialog', this.openModal)
+	},
+	methods: {
+		openModal(card) {
+			this.card = card
+			this.selectedStack = this.stackById(this.card.stackId)
+			this.selectedBoard = this.boardById(this.selectedStack.boardId)
+			this.loadStacksFromBoard(this.selectedBoard)
+			this.modalShow = true
+		},
+		async loadStacksFromBoard(board) {
+			try {
+				const url = generateUrl('/apps/deck/stacks/' + board.id)
+				const response = await axios.get(url)
+				this.stacksFromBoard = response.data
+			} catch (err) {
+				return err
+			}
+		},
+		async moveCard() {
+			this.copiedCard = Object.assign({}, this.card)
+			this.copiedCard.stackId = this.selectedStack.id
+			this.$store.dispatch('addCard', this.copiedCard)
+			this.modalShow = false
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.modal__content {
+	min-width: 250px;
+	min-height: 120px;
+	margin: 20px 20px 100px 20px;
+
+	h3 {
+		font-weight: bold;
+		text-align: center;
+	}
+
+	.select {
+		margin-bottom: 12px;
+	}
+}
+
+.modal__content button {
+	float: right;
+	margin-top: 50px;
+}
+</style>
diff --git a/src/CardMoveDialog.vue b/src/CardMoveDialog.vue
index 59a42a579..0593be4da 100644
--- a/src/CardMoveDialog.vue
+++ b/src/CardMoveDialog.vue
@@ -3,7 +3,7 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<NcModal v-if="modalShow" :title="t('deck', 'Move card to another board')" @close="modalShow=false">
+	<NcModal v-if="modalShow" :title="t('deck', 'Move card to another board')" @close="modalShow = false">
 		<div class="modal__content">
 			<h3>{{ t('deck', 'Move card to another board') }}</h3>
 			<NcSelect v-model="selectedBoard"
@@ -24,7 +24,7 @@
 			<button :disabled="!isBoardAndStackChoosen" class="primary" @click="moveCard">
 				{{ t('deck', 'Move card') }}
 			</button>
-			<button @click="modalShow=false">
+			<button @click="modalShow = false">
 				{{ t('deck', 'Cancel') }}
 			</button>
 		</div>
@@ -81,7 +81,7 @@ export default {
 			this.copiedCard = Object.assign({}, this.card)
 			this.copiedCard.stackId = this.selectedStack.id
 			this.$store.dispatch('moveCard', this.copiedCard)
-			if (parseInt(this.boardId) === parseInt(this.selectedStack.boardId)) {
+			if (parseInt(this.selectedBoard.id) === parseInt(this.selectedStack.boardId)) {
 				await this.$store.commit('addNewCard', { ...this.copiedCard })
 			}
 			this.modalShow = false
diff --git a/src/components/cards/CardMenuEntries.vue b/src/components/cards/CardMenuEntries.vue
index ce8da18c7..a3b9570c5 100644
--- a/src/components/cards/CardMenuEntries.vue
+++ b/src/components/cards/CardMenuEntries.vue
@@ -33,6 +33,12 @@
 			@click="openCardMoveDialog">
 			{{ t('deck', 'Move card') }}
 		</NcActionButton>
+		<NcActionButton v-if="canEdit"
+			icon="icon-external"
+			:close-after-click="true"
+			@click="openCardCloneDialog">
+			{{ t('deck', 'Clone card') }}
+		</NcActionButton>
 		<NcActionButton v-for="action in cardActions"
 			:key="action.label"
 			:close-after-click="true"
@@ -168,6 +174,9 @@ export default {
 		openCardMoveDialog() {
 			emit('deck:card:show-move-dialog', this.card)
 		},
+		openCardCloneDialog() {
+			emit('deck:card:show-clone-dialog', this.card)
+		},
 	},
 }
 </script>

From 55c44ef6d42ab9162e76b91cbcce6de6a100d07d Mon Sep 17 00:00:00 2001
From: grnd-alt <salimbelakkaf@outlook.de>
Date: Tue, 29 Oct 2024 12:22:16 +0100
Subject: [PATCH 02/12] fix(cards): use copy-content icon for cloning cards

Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>
---
 src/components/cards/CardMenuEntries.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/cards/CardMenuEntries.vue b/src/components/cards/CardMenuEntries.vue
index a3b9570c5..8f4401a78 100644
--- a/src/components/cards/CardMenuEntries.vue
+++ b/src/components/cards/CardMenuEntries.vue
@@ -34,9 +34,11 @@
 			{{ t('deck', 'Move card') }}
 		</NcActionButton>
 		<NcActionButton v-if="canEdit"
-			icon="icon-external"
 			:close-after-click="true"
 			@click="openCardCloneDialog">
+			<template #icon>
+				<CloneIcon :size="20" decorative />
+			</template>
 			{{ t('deck', 'Clone card') }}
 		</NcActionButton>
 		<NcActionButton v-for="action in cardActions"
@@ -64,6 +66,7 @@
 import { NcActionButton } from '@nextcloud/vue'
 import { mapGetters, mapState } from 'vuex'
 import ArchiveIcon from 'vue-material-design-icons/Archive.vue'
+import CloneIcon from 'vue-material-design-icons/ContentCopy.vue'
 import CardBulletedIcon from 'vue-material-design-icons/CardBulleted.vue'
 import { generateUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
@@ -74,7 +77,7 @@ import { emit } from '@nextcloud/event-bus'
 
 export default {
 	name: 'CardMenuEntries',
-	components: { NcActionButton, ArchiveIcon, CardBulletedIcon },
+	components: { CloneIcon, NcActionButton, ArchiveIcon, CardBulletedIcon },
 	props: {
 		card: {
 			type: Object,

From 838b648ef6911368751840c920c9d8a7f052098d Mon Sep 17 00:00:00 2001
From: grnd-alt <salimbelakkaf@outlook.de>
Date: Mon, 4 Nov 2024 12:45:33 +0100
Subject: [PATCH 03/12] introduce cloneCard backendFunctionality

Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>
---
 appinfo/routes.php                     |  1 +
 lib/Controller/CardController.php      |  9 +++++++++
 lib/Service/CardService.php            | 24 ++++++++++++++++++++++++
 lib/Service/LabelService.php           | 12 ++++++++++++
 src/CardCloneDialog.vue                |  7 +++----
 src/services/CardApi.js                | 17 +++++++++++++++++
 src/store/card.js                      |  5 +++++
 tests/unit/Service/CardServiceTest.php |  5 +++++
 8 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 1f3208c53..d56023645 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -43,6 +43,7 @@
 		['name' => 'card#read', 'url' => '/cards/{cardId}', 'verb' => 'GET'],
 		['name' => 'card#create', 'url' => '/cards', 'verb' => 'POST'],
 		['name' => 'card#update', 'url' => '/cards/{cardId}', 'verb' => 'PUT'],
+		['name' => 'card#clone', 'url' => '/cards/{cardId}/clone', 'verb' => 'POST'],
 		['name' => 'card#delete', 'url' => '/cards/{cardId}', 'verb' => 'DELETE'],
 		['name' => 'card#deleted', 'url' => '/{boardId}/cards/deleted', 'verb' => 'GET'],
 		['name' => 'card#rename', 'url' => '/cards/{cardId}/rename', 'verb' => 'PUT'],
diff --git a/lib/Controller/CardController.php b/lib/Controller/CardController.php
index c6ea2edf1..c0e6d10c3 100644
--- a/lib/Controller/CardController.php
+++ b/lib/Controller/CardController.php
@@ -90,6 +90,15 @@ public function create($title, $stackId, $type = 'plain', $order = 999, string $
 	public function update($id, $title, $stackId, $type, $order, $description, $duedate, $deletedAt) {
 		return $this->cardService->update($id, $title, $stackId, $type, $this->userId, $description, $order, $duedate, $deletedAt);
 	}
+	/**
+	 * @NoAdminRequired
+	 * @param $cardId
+	 * @param $targetStackId
+	 * @return \OCP\AppFramework\Db\Entity
+	 */
+	public function clone(int $cardId, ?int $targetStackId = null) {
+		return $this->cardService->cloneCard($cardId, $targetStackId);
+	}
 
 	/**
 	 * @NoAdminRequired
diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php
index fbce40646..e93c9be0a 100644
--- a/lib/Service/CardService.php
+++ b/lib/Service/CardService.php
@@ -78,6 +78,7 @@ public function __construct(
 		LoggerInterface $logger,
 		IRequest $request,
 		CardServiceValidator $cardServiceValidator,
+		private AssignmentService $assignmentService,
 		?string $userId,
 	) {
 		$this->cardMapper = $cardMapper;
@@ -391,6 +392,29 @@ public function update($id, $title, $stackId, $type, $owner, $description = '',
 		return $card;
 	}
 
+	public function cloneCard(int $id, ?int $targetStackId = null):Card {
+		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_READ);
+		$originCard = $this->cardMapper->find($id);
+		if ($targetStackId == null) {
+			$targetStackId = $originCard->getStackId();
+		}
+		$this->permissionService->checkPermission($this->stackMapper, $targetStackId, Acl::PERMISSION_EDIT);
+		$newCard = $this->create($originCard->getTitle(), $targetStackId, $originCard->getType(), $originCard->getOrder(), $originCard->getOwner());
+		$boardId = $this->stackMapper->findBoardId($targetStackId);
+		foreach ($this->labelMapper->findAssignedLabelsForCard($id) as $label) {
+			if ($boardId != $this->stackMapper->findBoardId($originCard->getStackId())) {
+				$label = $this->labelService->cloneLabelIfNotExists($label->getId(), $boardId);
+			}
+			$this->assignLabel($newCard->getId(), $label->getId());
+		}
+		foreach ($this->assignedUsersMapper->findAll($id) as $assignement) {
+			$this->assignmentService->assignUser($newCard->getId(), $assignement->getParticipant());
+		}
+		$newCard->setDescription($originCard->getDescription());
+		$card = $this->enrichCards([$this->cardMapper->update($newCard)]);
+		return $card[0];
+	}
+
 	/**
 	 * @param $id
 	 * @param $title
diff --git a/lib/Service/LabelService.php b/lib/Service/LabelService.php
index 98150a62c..69f372c42 100644
--- a/lib/Service/LabelService.php
+++ b/lib/Service/LabelService.php
@@ -93,6 +93,18 @@ public function create($title, $color, $boardId) {
 		return $this->labelMapper->insert($label);
 	}
 
+	public function cloneLabelIfNotExists(int $labelId, int $targetBoardId): Label {
+		$this->permissionService->checkPermission(null, $targetBoardId, Acl::PERMISSION_MANAGE);
+		$boardLabels = $this->boardService->find($targetBoardId)->getLabels();
+		$originLabel = $this->find($labelId);
+		$filteredValues = array_values(array_filter($boardLabels, fn ($item) => $item->getTitle() === $originLabel->getTitle()));
+		if (empty($filteredValues)) {
+			$label = $this->create($originLabel->getTitle(), $originLabel->getColor(), $targetBoardId);
+			return $label;
+		}
+		return $originLabel;
+	}
+
 	/**
 	 * @param $id
 	 * @return \OCP\AppFramework\Db\Entity
diff --git a/src/CardCloneDialog.vue b/src/CardCloneDialog.vue
index b0d1b4f27..94fbe8d66 100644
--- a/src/CardCloneDialog.vue
+++ b/src/CardCloneDialog.vue
@@ -21,7 +21,7 @@
 				:max-height="100"
 				label="title" />
 
-			<button :disabled="!isBoardAndStackChoosen" class="primary" @click="moveCard">
+			<button :disabled="!isBoardAndStackChoosen" class="primary" @click="cloneCard">
 				{{ t('deck', 'Clone card') }}
 			</button>
 			<button @click="modalShow = false">
@@ -89,9 +89,8 @@ export default {
 				return err
 			}
 		},
-		async moveCard() {
-			this.copiedCard = Object.assign({}, this.card)
-			this.copiedCard.stackId = this.selectedStack.id
+		async cloneCard() {
+			this.$store.dispatch('cloneCard', { cardId: this.card.id, targetStackId: this.selectedStack.id })
 			this.$store.dispatch('addCard', this.copiedCard)
 			this.modalShow = false
 		},
diff --git a/src/services/CardApi.js b/src/services/CardApi.js
index 11d72c559..a25182c99 100644
--- a/src/services/CardApi.js
+++ b/src/services/CardApi.js
@@ -28,6 +28,23 @@ export class CardApi {
 			})
 	}
 
+	cloneCard(cardId, targetStackId) {
+		return axios.post(this.url(`/cards/${cardId}/clone`), {
+			targetStackId,
+		})
+			.then(
+				(response) => {
+					return Promise.resolve(response.data)
+				},
+				(err) => {
+					return Promise.reject(err)
+				},
+			)
+			.catch((err) => {
+				return Promise.reject(err)
+			})
+	}
+
 	deleteCard(cardId) {
 		return axios.delete(this.url(`/cards/${cardId}`))
 			.then(
diff --git a/src/store/card.js b/src/store/card.js
index 07c3e389d..63f85eb50 100644
--- a/src/store/card.js
+++ b/src/store/card.js
@@ -272,6 +272,11 @@ export default {
 		},
 	},
 	actions: {
+		async cloneCard({ commit }, { cardId, targetStackId }) {
+			const createdCard = await apiClient.cloneCard(cardId, targetStackId)
+			commit('addCard', createdCard)
+			return createdCard
+		},
 		async addCard({ commit }, card) {
 			const createdCard = await apiClient.addCard(card)
 			commit('addCard', createdCard)
diff --git a/tests/unit/Service/CardServiceTest.php b/tests/unit/Service/CardServiceTest.php
index 92280c993..bb4400e7d 100644
--- a/tests/unit/Service/CardServiceTest.php
+++ b/tests/unit/Service/CardServiceTest.php
@@ -93,6 +93,9 @@ class CardServiceTest extends TestCase {
 	/** @var CardServiceValidator|MockObject */
 	private $cardServiceValidator;
 
+	/** @var AssignmentService|MockObject */
+	private $assignmentService;
+
 	public function setUp(): void {
 		parent::setUp();
 		$this->cardMapper = $this->createMock(CardMapper::class);
@@ -114,6 +117,7 @@ public function setUp(): void {
 		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->request = $this->createMock(IRequest::class);
 		$this->cardServiceValidator = $this->createMock(CardServiceValidator::class);
+		$this->assignmentService = $this->createMock(AssignmentService::class);
 
 		$this->logger->expects($this->any())->method('error');
 
@@ -137,6 +141,7 @@ public function setUp(): void {
 			$this->logger,
 			$this->request,
 			$this->cardServiceValidator,
+			$this->assignmentService,
 			'user1'
 		);
 	}

From 1fe20dcc1d1af337d8f72961fe368ec7ddeb4844 Mon Sep 17 00:00:00 2001
From: grnd-alt <salimbelakkaf@outlook.de>
Date: Thu, 7 Nov 2024 10:50:20 +0100
Subject: [PATCH 04/12] check user-permsisions when assigning to cloned card

Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>
---
 lib/Service/CardService.php | 92 +++++++++++++------------------------
 1 file changed, 32 insertions(+), 60 deletions(-)

diff --git a/lib/Service/CardService.php b/lib/Service/CardService.php
index e93c9be0a..15f659df9 100644
--- a/lib/Service/CardService.php
+++ b/lib/Service/CardService.php
@@ -37,70 +37,33 @@
 use Psr\Log\LoggerInterface;
 
 class CardService {
-	private CardMapper $cardMapper;
-	private StackMapper $stackMapper;
-	private BoardMapper $boardMapper;
-	private LabelMapper $labelMapper;
-	private LabelService $labelService;
-	private PermissionService $permissionService;
-	private BoardService $boardService;
-	private NotificationHelper $notificationHelper;
-	private AssignmentMapper $assignedUsersMapper;
-	private AttachmentService $attachmentService;
-	private ?string $currentUser;
-	private ActivityManager $activityManager;
-	private ICommentsManager $commentsManager;
-	private ChangeHelper $changeHelper;
-	private IEventDispatcher $eventDispatcher;
-	private IUserManager $userManager;
-	private IURLGenerator $urlGenerator;
-	private LoggerInterface $logger;
-	private IRequest $request;
-	private CardServiceValidator $cardServiceValidator;
+
+	private string $currentUser;
 
 	public function __construct(
-		CardMapper $cardMapper,
-		StackMapper $stackMapper,
-		BoardMapper $boardMapper,
-		LabelMapper $labelMapper,
-		LabelService $labelService,
-		PermissionService $permissionService,
-		BoardService $boardService,
-		NotificationHelper $notificationHelper,
-		AssignmentMapper $assignedUsersMapper,
-		AttachmentService $attachmentService,
-		ActivityManager $activityManager,
-		ICommentsManager $commentsManager,
-		IUserManager $userManager,
-		ChangeHelper $changeHelper,
-		IEventDispatcher $eventDispatcher,
-		IURLGenerator $urlGenerator,
-		LoggerInterface $logger,
-		IRequest $request,
-		CardServiceValidator $cardServiceValidator,
+		private CardMapper $cardMapper,
+		private StackMapper $stackMapper,
+		private BoardMapper $boardMapper,
+		private LabelMapper $labelMapper,
+		private LabelService $labelService,
+		private PermissionService $permissionService,
+		private BoardService $boardService,
+		private NotificationHelper $notificationHelper,
+		private AssignmentMapper $assignedUsersMapper,
+		private AttachmentService $attachmentService,
+		private ActivityManager $activityManager,
+		private ICommentsManager $commentsManager,
+		private IUserManager $userManager,
+		private ChangeHelper $changeHelper,
+		private IEventDispatcher $eventDispatcher,
+		private IURLGenerator $urlGenerator,
+		private LoggerInterface $logger,
+		private IRequest $request,
+		private CardServiceValidator $cardServiceValidator,
 		private AssignmentService $assignmentService,
 		?string $userId,
 	) {
-		$this->cardMapper = $cardMapper;
-		$this->stackMapper = $stackMapper;
-		$this->boardMapper = $boardMapper;
-		$this->labelMapper = $labelMapper;
-		$this->labelService = $labelService;
-		$this->permissionService = $permissionService;
-		$this->boardService = $boardService;
-		$this->notificationHelper = $notificationHelper;
-		$this->assignedUsersMapper = $assignedUsersMapper;
-		$this->attachmentService = $attachmentService;
-		$this->activityManager = $activityManager;
-		$this->commentsManager = $commentsManager;
-		$this->userManager = $userManager;
-		$this->changeHelper = $changeHelper;
-		$this->eventDispatcher = $eventDispatcher;
 		$this->currentUser = $userId;
-		$this->urlGenerator = $urlGenerator;
-		$this->logger = $logger;
-		$this->request = $request;
-		$this->cardServiceValidator = $cardServiceValidator;
 	}
 
 	public function enrichCards($cards) {
@@ -395,7 +358,7 @@ public function update($id, $title, $stackId, $type, $owner, $description = '',
 	public function cloneCard(int $id, ?int $targetStackId = null):Card {
 		$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_READ);
 		$originCard = $this->cardMapper->find($id);
-		if ($targetStackId == null) {
+		if ($targetStackId === null) {
 			$targetStackId = $originCard->getStackId();
 		}
 		$this->permissionService->checkPermission($this->stackMapper, $targetStackId, Acl::PERMISSION_EDIT);
@@ -403,11 +366,20 @@ public function cloneCard(int $id, ?int $targetStackId = null):Card {
 		$boardId = $this->stackMapper->findBoardId($targetStackId);
 		foreach ($this->labelMapper->findAssignedLabelsForCard($id) as $label) {
 			if ($boardId != $this->stackMapper->findBoardId($originCard->getStackId())) {
-				$label = $this->labelService->cloneLabelIfNotExists($label->getId(), $boardId);
+				try {
+					$label = $this->labelService->cloneLabelIfNotExists($label->getId(), $boardId);
+				} catch (NoPermissionException $e) {
+					break;
+				}
 			}
 			$this->assignLabel($newCard->getId(), $label->getId());
 		}
 		foreach ($this->assignedUsersMapper->findAll($id) as $assignement) {
+			try {
+				$this->permissionService->checkPermission($this->cardMapper, $newCard->getId(), Acl::PERMISSION_READ, $assignement->getParticipant());
+			} catch (NoPermissionException $e) {
+				continue;
+			}
 			$this->assignmentService->assignUser($newCard->getId(), $assignement->getParticipant());
 		}
 		$newCard->setDescription($originCard->getDescription());

From 2e0f0d29b6f7f5ae8ff446304b6220c05b5c80ea Mon Sep 17 00:00:00 2001
From: grnd-alt <salimbelakkaf@outlook.de>
Date: Thu, 14 Nov 2024 10:13:54 +0100
Subject: [PATCH 05/12] feat(tests): add tests for labelService and cardService
 functions

Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>
---
 tests/unit/Service/CardServiceTest.php  | 56 +++++++++++++++++++++++++
 tests/unit/Service/LabelServiceTest.php | 48 +++++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/tests/unit/Service/CardServiceTest.php b/tests/unit/Service/CardServiceTest.php
index bb4400e7d..e5600b3ae 100644
--- a/tests/unit/Service/CardServiceTest.php
+++ b/tests/unit/Service/CardServiceTest.php
@@ -32,6 +32,7 @@
 use OCA\Deck\Db\Card;
 use OCA\Deck\Db\CardMapper;
 use OCA\Deck\Db\ChangeHelper;
+use OCA\Deck\Db\Label;
 use OCA\Deck\Db\LabelMapper;
 use OCA\Deck\Db\Stack;
 use OCA\Deck\Db\StackMapper;
@@ -224,6 +225,61 @@ public function testCreate() {
 		$this->assertEquals($b->getStackId(), 123);
 	}
 
+	public function testClone() {
+		$card = new Card();
+		$card->setId(1);
+		$card->setTitle('Card title');
+		$card->setOwner('admin');
+		$card->setStackId(12345);
+		$clonedCard = clone $card;
+		$clonedCard->setId(2);
+		$clonedCard->setStackId(1234);
+		$this->cardMapper->expects($this->exactly(2))
+			->method('insert')
+			->willReturn($card, $clonedCard);
+
+		$this->cardMapper->expects($this->once())
+			->method('update')->willReturn($clonedCard);
+		$this->cardMapper->expects($this->exactly(2))
+			->method('find')
+			->willReturn($card, $clonedCard);
+
+		// check if users are assigned
+		$this->assignmentService->expects($this->once())
+			->method('assignUser')
+			->with(2, 'admin');
+		$a1 = new Assignment();
+		$a1->setCardId(2);
+		$a1->setType(0);
+		$a1->setParticipant('admin');
+		$this->assignedUsersMapper->expects($this->once())
+			->method('findAll')
+			->with(1)
+			->willReturn([$a1]);
+
+		// check if labels get cloned
+		$label = new Label();
+		$label->setId(1);
+		$this->labelMapper->expects($this->once())
+			->method('findAssignedLabelsForCard')
+			->willReturn([$label]);
+		$this->cardMapper->expects($this->once())
+			->method('assignLabel')
+			->with($clonedCard->getId(), $label->getId())
+			->willReturn($label);
+
+		$stackMock = new Stack();
+		$stackMock->setBoardId(1234);
+		$this->stackMapper->expects($this->once())
+			->method('find')
+			->willReturn($stackMock);
+		$b = $this->cardService->create('Card title', 123, 'text', 999, 'admin');
+		$c = $this->cardService->cloneCard($b->getId(), 1234);
+		$this->assertEquals($b->getTitle(), $c->getTitle());
+		$this->assertEquals($b->getOwner(), $c->getOwner());
+		$this->assertNotEquals($b->getStackId(), $c->getStackId());
+	}
+
 	public function testDelete() {
 		$cardToBeDeleted = new Card();
 		$this->cardMapper->expects($this->once())
diff --git a/tests/unit/Service/LabelServiceTest.php b/tests/unit/Service/LabelServiceTest.php
index 3c61b8ad2..c492a972c 100644
--- a/tests/unit/Service/LabelServiceTest.php
+++ b/tests/unit/Service/LabelServiceTest.php
@@ -24,6 +24,7 @@
 
 namespace OCA\Deck\Service;
 
+use OCA\Deck\Db\Board;
 use OCA\Deck\Db\ChangeHelper;
 use OCA\Deck\Db\Label;
 use OCA\Deck\Db\LabelMapper;
@@ -105,6 +106,53 @@ public function testUpdate() {
 		$this->assertEquals($b->getColor(), 'ffffff');
 	}
 
+	public function testCloneLabelIfNotExists() {
+		$label = new Label();
+		$label->setId(1);
+		$label->setTitle('title');
+		$label->setColor('00ff00');
+		$this->labelMapper->expects($this->once())
+			->method('find')
+			->willReturn($label);
+
+		$expectedLabel = new Label();
+		$expectedLabel->setTitle('title');
+		$expectedLabel->setColor('00ff00');
+		$expectedLabel->setBoardId(1);
+		$this->labelMapper->expects($this->once())
+			->method('insert')
+			->with($expectedLabel)
+			->willReturn($label);
+		$board = new Board();
+		$board->setLabels([]);
+		$this->boardService->expects($this->once())
+			->method('find')
+			->willReturn($board);
+
+		$this->labelService->cloneLabelIfNotExists(1, 1);
+	}
+
+	public function testCloneLabelIfExists() {
+		$label = new Label();
+		$label->setId(1);
+		$label->setTitle('title');
+		$label->setColor('00ff00');
+		$this->labelMapper->expects($this->once())
+			->method('find')
+			->willReturn($label);
+		$this->labelMapper->expects($this->never())
+			->method('insert')
+			->with($label);
+		$board = new Board();
+		$board->setLabels([$label]);
+		$this->boardService->expects($this->once())
+			->method('find')
+			->willReturn($board);
+
+		$this->labelService->cloneLabelIfNotExists(1, 1);
+
+	}
+
 	public function testDelete() {
 		$label = new Label();
 		$label->setId(1);

From 0a48954f1845602a216fbef64d8f0de43f07127f Mon Sep 17 00:00:00 2001
From: grnd-alt <git@belakkaf.net>
Date: Mon, 25 Nov 2024 13:56:03 +0100
Subject: [PATCH 06/12] add cypress tests for cardfeatures

Signed-off-by: grnd-alt <git@belakkaf.net>
---
 cypress/e2e/cardFeatures.js | 45 ++++++++++++++++++++++++-------------
 src/CardCloneDialog.vue     |  1 -
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/cypress/e2e/cardFeatures.js b/cypress/e2e/cardFeatures.js
index 905725e24..0ae250df5 100644
--- a/cypress/e2e/cardFeatures.js
+++ b/cypress/e2e/cardFeatures.js
@@ -25,9 +25,9 @@ const useModal = (useModal) => {
 	})
 }
 
-describe('Card', function() {
+describe('Card', function () {
 	let boardId
-	before(function() {
+	before(function () {
 		cy.createUser(user)
 		cy.login(user)
 		cy.createExampleBoard({
@@ -38,11 +38,11 @@ describe('Card', function() {
 		})
 	})
 
-	beforeEach(function() {
+	beforeEach(function () {
 		cy.login(user)
 	})
 
-	it('Can add a card', function() {
+	it('Can add a card', function () {
 		cy.visit(`/apps/deck/#/board/${boardId}`)
 		const newCardTitle = 'Write some cypress tests'
 
@@ -63,7 +63,7 @@ describe('Card', function() {
 		})
 	})
 
-	it('Create card from overview', function() {
+	it('Create card from overview', function () {
 		cy.visit(`/apps/deck/#/`)
 		const newCardTitle = 'Test create from overview'
 		cy.intercept({ method: 'POST', url: '**/apps/deck/cards' }).as('save')
@@ -91,14 +91,14 @@ describe('Card', function() {
 	})
 
 	describe('Modal', () => {
-		beforeEach(function() {
+		beforeEach(function () {
 			cy.login(user)
 			useModal(true).then(() => {
 				cy.visit(`/apps/deck/#/board/${boardId}`)
 			})
 		})
 
-		it('Can show card details modal', function() {
+		it('Can show card details modal', function () {
 			cy.getNavigationEntry(boardData.title)
 				.first().click({ force: true })
 
@@ -118,13 +118,13 @@ describe('Card', function() {
 			cy.get('button.icon-folder').should('be.visible')
 				.click()
 			cy.get('.file-picker__main').should('be.visible')
-			cy.get('.file-picker__main [data-filename="welcome.txt"]', { timeout: 30000 }).should('be.visible')
+			cy.get('.file-picker__main [data-filename="Nextcloud_Server_Administration_Manual.pdf"]', { timeout: 30000 }).should('be.visible')
 				.click()
 			cy.get('.dialog__actions button.button-vue--vue-primary').click()
-			cy.get('.attachment-list .basename').contains('welcome.txt')
+			cy.get('.attachment-list .basename').contains('Nextcloud_Server_Administration_Manual.pdf')
 		})
 
-		it.only('Shows the modal with the editor', () => {
+		it('Shows the modal with the editor', () => {
 			cy.get('.card:contains("Hello world")').should('be.visible').click()
 			cy.intercept({ method: 'PUT', url: '**/apps/deck/cards/*' }).as('save')
 			cy.get('.modal__card').should('be.visible')
@@ -161,9 +161,9 @@ describe('Card', function() {
 			cy.get('.reference-picker-modal--content .reference-picker .multiselect-list').should('be.visible').contains(boardData.stacks[0].title)
 			cy.get('.reference-picker-modal--content .reference-picker button.button-vue--vue-primary').should('be.visible').click()
 			cy.wait('@save', { timeout: 7000 })
-			cy.get('.modal__card .ProseMirror').contains('/index.php/apps/deck/card/').should('be.visible')
+			cy.get('.modal__card .ProseMirror').contains('/index.php/apps/deck/card/').should('have.length', 1)
 
-			cy.visit(`/apps/deck/#/board/${boardId}`)
+			cy.visit(`/apps/deck/board/${boardId}`)
 			cy.reload()
 			cy.get('.board .stack').eq(0).within(() => {
 				cy.get(`.card:contains("${newCardTitle}")`).should('be.visible')
@@ -172,7 +172,7 @@ describe('Card', function() {
 	})
 
 	describe('Sidebar', () => {
-		beforeEach(function() {
+		beforeEach(function () {
 			cy.login(user)
 			useModal(false).then(() => {
 				cy.visit(`/apps/deck/#/board/${boardId}`)
@@ -185,7 +185,7 @@ describe('Card', function() {
 				.find('.ProseMirror h1').contains('Hello world writing more text').should('be.visible')
 		})
 
-		it('Set a due date', function() {
+		it('Set a due date', function () {
 			const newCardTitle = 'Card with a due date'
 
 			cy.get('.button-vue[aria-label*="Add card"]')
@@ -223,7 +223,7 @@ describe('Card', function() {
 			cy.get(`.card:contains("${newCardTitle}")`).find('[data-due-state]').should('not.exist')
 		})
 
-		it('Add a label', function() {
+		it('Add a label', function () {
 			const newCardTitle = 'Card with labels'
 
 			cy.get('.button-vue[aria-label*="Add card"]')
@@ -252,7 +252,7 @@ describe('Card', function() {
 	})
 
 	describe('Card actions', () => {
-		beforeEach(function() {
+		beforeEach(function () {
 			cy.login(user)
 			useModal(false).then(() => {
 				cy.visit(`/apps/deck/#/board/${boardId}`)
@@ -298,5 +298,18 @@ describe('Card', function() {
 				})
 			})
 		})
+
+		it('clone card', () => {
+			cy.intercept({ method: 'POST', url: '**/apps/deck/cards/*/clone' }).as('clone')
+			cy.get('.card:contains("Hello world")').should('be.visible').click()
+			cy.get('#app-sidebar-vue')
+				.find('.ProseMirror h1').contains('Hello world').should('be.visible')
+
+			cy.get('.app-sidebar-header .action-item__menutoggle').click()
+			cy.get('.v-popper__popper button:contains("Clone card")').click()
+			cy.get('.modal__content button:contains("Clone card")').click()
+			cy.wait('@clone', { timeout: 7000 })
+			cy.get('.card:contains("Hello world")').should('have.length', 2)
+		})
 	})
 })
diff --git a/src/CardCloneDialog.vue b/src/CardCloneDialog.vue
index 94fbe8d66..821ddd824 100644
--- a/src/CardCloneDialog.vue
+++ b/src/CardCloneDialog.vue
@@ -91,7 +91,6 @@ export default {
 		},
 		async cloneCard() {
 			this.$store.dispatch('cloneCard', { cardId: this.card.id, targetStackId: this.selectedStack.id })
-			this.$store.dispatch('addCard', this.copiedCard)
 			this.modalShow = false
 		},
 	},

From d829a28ddf00a0ff50952c035bbfdd7c8e95e72a Mon Sep 17 00:00:00 2001
From: grnd-alt <git@belakkaf.net>
Date: Thu, 5 Dec 2024 14:00:20 +0100
Subject: [PATCH 07/12] skip cypress test causing chrome out of memory crash

Signed-off-by: grnd-alt <git@belakkaf.net>
---
 cypress/e2e/cardFeatures.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/cardFeatures.js b/cypress/e2e/cardFeatures.js
index 0ae250df5..366a6bd7b 100644
--- a/cypress/e2e/cardFeatures.js
+++ b/cypress/e2e/cardFeatures.js
@@ -63,7 +63,8 @@ describe('Card', function () {
 		})
 	})
 
-	it('Create card from overview', function () {
+	// TODO reintroduce this test
+	it.skip('Create card from overview', function () {
 		cy.visit(`/apps/deck/#/`)
 		const newCardTitle = 'Test create from overview'
 		cy.intercept({ method: 'POST', url: '**/apps/deck/cards' }).as('save')

From 3391a40b779beae591727399e26f07b2366fefa9 Mon Sep 17 00:00:00 2001
From: Julius Knorr <jus@bitgrid.net>
Date: Wed, 18 Dec 2024 22:59:42 +0100
Subject: [PATCH 08/12] tests(cypress): Try sleep to avoid electron crash in
 modal

Signed-off-by: Julius Knorr <jus@bitgrid.net>
---
 cypress/e2e/cardFeatures.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/cardFeatures.js b/cypress/e2e/cardFeatures.js
index 366a6bd7b..74a3a7226 100644
--- a/cypress/e2e/cardFeatures.js
+++ b/cypress/e2e/cardFeatures.js
@@ -63,8 +63,7 @@ describe('Card', function () {
 		})
 	})
 
-	// TODO reintroduce this test
-	it.skip('Create card from overview', function () {
+	it('Create card from overview', function () {
 		cy.visit(`/apps/deck/#/`)
 		const newCardTitle = 'Test create from overview'
 		cy.intercept({ method: 'POST', url: '**/apps/deck/cards' }).as('save')
@@ -72,6 +71,10 @@ describe('Card', function () {
 
 		cy.get('.button-vue[aria-label*="Add card"]')
 			.first().click()
+
+		// Somehow this avoids the electron crash
+		cy.wait(2000)
+
 		cy.get('.modal-mask.card-selector .card-title').should('be.visible').click().type(newCardTitle)
 		cy.get('.modal-mask.card-selector .multiselect-board').should('be.visible').click()
 		cy.get('.vs__dropdown-menu [data-cy="board-select-title"]:contains("' + boardData.title + '")').should('be.visible').click()

From 4d17f106753d4199e68587a9e3ab962cc0fe73e1 Mon Sep 17 00:00:00 2001
From: Julius Knorr <jus@bitgrid.net>
Date: Wed, 18 Dec 2024 23:02:33 +0100
Subject: [PATCH 09/12] tests(cypress): Revert filename to pass with example
 files on CI

Signed-off-by: Julius Knorr <jus@bitgrid.net>
---
 cypress/e2e/cardFeatures.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/cardFeatures.js b/cypress/e2e/cardFeatures.js
index 74a3a7226..5d7d747e5 100644
--- a/cypress/e2e/cardFeatures.js
+++ b/cypress/e2e/cardFeatures.js
@@ -122,10 +122,10 @@ describe('Card', function () {
 			cy.get('button.icon-folder').should('be.visible')
 				.click()
 			cy.get('.file-picker__main').should('be.visible')
-			cy.get('.file-picker__main [data-filename="Nextcloud_Server_Administration_Manual.pdf"]', { timeout: 30000 }).should('be.visible')
+			cy.get('.file-picker__main [data-filename="welcome.txt"]', { timeout: 30000 }).should('be.visible')
 				.click()
 			cy.get('.dialog__actions button.button-vue--vue-primary').click()
-			cy.get('.attachment-list .basename').contains('Nextcloud_Server_Administration_Manual.pdf')
+			cy.get('.attachment-list .basename').contains('welcome.txt')
 		})
 
 		it('Shows the modal with the editor', () => {

From 22bb8d65e96d5f1bd94aa7af753e91b83ffc66df Mon Sep 17 00:00:00 2001
From: grnd-alt <git@belakkaf.net>
Date: Thu, 19 Dec 2024 13:30:09 +0100
Subject: [PATCH 10/12] put copy logic into move dialog

Signed-off-by: grnd-alt <git@belakkaf.net>
---
 cypress/e2e/cardFeatures.js              |   4 +-
 src/App.vue                              |   3 -
 src/CardCloneDialog.vue                  | 120 -----------------------
 src/CardMoveDialog.vue                   |  30 ++++--
 src/components/cards/CardMenuEntries.vue |  16 +--
 5 files changed, 27 insertions(+), 146 deletions(-)
 delete mode 100644 src/CardCloneDialog.vue

diff --git a/cypress/e2e/cardFeatures.js b/cypress/e2e/cardFeatures.js
index 5d7d747e5..5d5115c3d 100644
--- a/cypress/e2e/cardFeatures.js
+++ b/cypress/e2e/cardFeatures.js
@@ -310,8 +310,8 @@ describe('Card', function () {
 				.find('.ProseMirror h1').contains('Hello world').should('be.visible')
 
 			cy.get('.app-sidebar-header .action-item__menutoggle').click()
-			cy.get('.v-popper__popper button:contains("Clone card")').click()
-			cy.get('.modal__content button:contains("Clone card")').click()
+			cy.get('.v-popper__popper button:contains("Move/copy card")').click()
+			cy.get('.modal__content button:contains("Copy card")').click()
 			cy.wait('@clone', { timeout: 7000 })
 			cy.get('.card:contains("Hello world")').should('have.length', 2)
 		})
diff --git a/src/App.vue b/src/App.vue
index 7f68bd18e..f43f6c516 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,7 +26,6 @@
 		</div>
 		<KeyboardShortcuts />
 		<CardMoveDialog />
-		<CardCloneDialog />
 	</NcContent>
 </template>
 
@@ -39,7 +38,6 @@ import { BoardApi } from './services/BoardApi.js'
 import { emit, subscribe } from '@nextcloud/event-bus'
 import { loadState } from '@nextcloud/initial-state'
 import CardMoveDialog from './CardMoveDialog.vue'
-import CardCloneDialog from './CardCloneDialog.vue'
 
 const boardApi = new BoardApi()
 
@@ -47,7 +45,6 @@ export default {
 	name: 'App',
 	components: {
 		CardMoveDialog,
-		CardCloneDialog,
 		AppNavigation,
 		NcModal,
 		NcContent,
diff --git a/src/CardCloneDialog.vue b/src/CardCloneDialog.vue
deleted file mode 100644
index 821ddd824..000000000
--- a/src/CardCloneDialog.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-<!--
-  - SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
-  - SPDX-License-Identifier: AGPL-3.0-or-later
--->
-<template>
-	<NcModal v-if="modalShow" :title="t('deck', 'Clone card')" @close="modalShow = false">
-		<div class="modal__content">
-			<h3>{{ t('deck', 'Clone card to another board') }}</h3>
-			<NcSelect v-model="selectedBoard"
-				:input-label="t('deck', 'Select a board')"
-				:placeholder="t('deck', 'Select a board')"
-				:options="activeBoards"
-				:max-height="100"
-				label="title"
-				@option:selected="loadStacksFromBoard" />
-			<NcSelect v-model="selectedStack"
-				:disabled="stacksFromBoard.length === 0"
-				:placeholder="stacksFromBoard.length === 0 ? t('deck', 'No lists available') : t('deck', 'Select a list')"
-				:input-label="t('deck', 'Select a list')"
-				:options="stacksFromBoard"
-				:max-height="100"
-				label="title" />
-
-			<button :disabled="!isBoardAndStackChoosen" class="primary" @click="cloneCard">
-				{{ t('deck', 'Clone card') }}
-			</button>
-			<button @click="modalShow = false">
-				{{ t('deck', 'Cancel') }}
-			</button>
-		</div>
-	</NcModal>
-</template>
-
-<script>
-import { NcModal, NcSelect } from '@nextcloud/vue'
-import { generateUrl } from '@nextcloud/router'
-import axios from '@nextcloud/axios'
-import { subscribe, unsubscribe } from '@nextcloud/event-bus'
-import { mapGetters, mapState } from 'vuex'
-
-export default {
-	name: 'CardCloneDialog',
-	components: { NcModal, NcSelect },
-	data() {
-		return {
-			card: null,
-			modalShow: false,
-			selectedBoard: '',
-			selectedStack: '',
-			stacksFromBoard: [],
-		}
-	},
-	computed: {
-		...mapGetters([
-			'boards',
-			'stackById',
-			'boardById',
-		]),
-		...mapState({
-			currentBoard: state => state.currentBoard,
-		}),
-		activeBoards() {
-			return this.$store.getters.boards.filter((item) => item.deletedAt === 0 && item.archived === false)
-		},
-		isBoardAndStackChoosen() {
-			return !(this.selectedBoard === '' || this.selectedStack === '')
-		},
-	},
-	mounted() {
-		subscribe('deck:card:show-clone-dialog', this.openModal)
-	},
-	destroyed() {
-		unsubscribe('deck:card:show-clone-dialog', this.openModal)
-	},
-	methods: {
-		openModal(card) {
-			this.card = card
-			this.selectedStack = this.stackById(this.card.stackId)
-			this.selectedBoard = this.boardById(this.selectedStack.boardId)
-			this.loadStacksFromBoard(this.selectedBoard)
-			this.modalShow = true
-		},
-		async loadStacksFromBoard(board) {
-			try {
-				const url = generateUrl('/apps/deck/stacks/' + board.id)
-				const response = await axios.get(url)
-				this.stacksFromBoard = response.data
-			} catch (err) {
-				return err
-			}
-		},
-		async cloneCard() {
-			this.$store.dispatch('cloneCard', { cardId: this.card.id, targetStackId: this.selectedStack.id })
-			this.modalShow = false
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-.modal__content {
-	min-width: 250px;
-	min-height: 120px;
-	margin: 20px 20px 100px 20px;
-
-	h3 {
-		font-weight: bold;
-		text-align: center;
-	}
-
-	.select {
-		margin-bottom: 12px;
-	}
-}
-
-.modal__content button {
-	float: right;
-	margin-top: 50px;
-}
-</style>
diff --git a/src/CardMoveDialog.vue b/src/CardMoveDialog.vue
index 0593be4da..aa0389b99 100644
--- a/src/CardMoveDialog.vue
+++ b/src/CardMoveDialog.vue
@@ -5,7 +5,7 @@
 <template>
 	<NcModal v-if="modalShow" :title="t('deck', 'Move card to another board')" @close="modalShow = false">
 		<div class="modal__content">
-			<h3>{{ t('deck', 'Move card to another board') }}</h3>
+			<h3>{{ t('deck', 'Move/copy card to another board') }}</h3>
 			<NcSelect v-model="selectedBoard"
 				:input-label="t('deck', 'Select a board')"
 				:placeholder="t('deck', 'Select a board')"
@@ -21,25 +21,29 @@
 				:max-height="100"
 				label="title" />
 
-			<button :disabled="!isBoardAndStackChoosen" class="primary" @click="moveCard">
+			<NcButton :disabled="!isBoardAndStackChoosen" type="primary" @click="moveCard">
 				{{ t('deck', 'Move card') }}
-			</button>
-			<button @click="modalShow = false">
+			</NcButton>
+			<NcButton :disabled="!isBoardAndStackChoosen" type="primary" @click="cloneCard">
+				{{ t('deck', 'Copy card') }}
+			</NcButton>
+			<NcButton @click="modalShow = false">
 				{{ t('deck', 'Cancel') }}
-			</button>
+			</NcButton>
 		</div>
 	</NcModal>
 </template>
 
 <script>
-import { NcModal, NcSelect } from '@nextcloud/vue'
+import { NcModal, NcSelect, NcButton } from '@nextcloud/vue'
 import { generateUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
+import { mapGetters } from 'vuex'
 
 export default {
 	name: 'CardMoveDialog',
-	components: { NcModal, NcSelect },
+	components: { NcModal, NcSelect, NcButton },
 	data() {
 		return {
 			card: null,
@@ -50,6 +54,7 @@ export default {
 		}
 	},
 	computed: {
+		...mapGetters(['stackById', 'boardById']),
 		activeBoards() {
 			return this.$store.getters.boards.filter((item) => item.deletedAt === 0 && item.archived === false)
 		},
@@ -66,6 +71,9 @@ export default {
 	methods: {
 		openModal(card) {
 			this.card = card
+			this.selectedStack = this.stackById(this.card.stackId)
+			this.selectedBoard = this.boardById(this.selectedStack.boardId)
+			this.loadStacksFromBoard(this.selectedBoard)
 			this.modalShow = true
 		},
 		async loadStacksFromBoard(board) {
@@ -86,6 +94,10 @@ export default {
 			}
 			this.modalShow = false
 		},
+		async cloneCard() {
+			this.$store.dispatch('cloneCard', { cardId: this.card.id, targetStackId: this.selectedStack.id })
+			this.modalShow = false
+		},
 	},
 }
 </script>
@@ -106,6 +118,10 @@ export default {
 	}
 }
 
+button{
+	margin-left: 6px;
+}
+
 .modal__content button {
 	float: right;
 	margin-top: 50px;
diff --git a/src/components/cards/CardMenuEntries.vue b/src/components/cards/CardMenuEntries.vue
index 8f4401a78..af5fc6944 100644
--- a/src/components/cards/CardMenuEntries.vue
+++ b/src/components/cards/CardMenuEntries.vue
@@ -31,15 +31,7 @@
 			icon="icon-external"
 			:close-after-click="true"
 			@click="openCardMoveDialog">
-			{{ t('deck', 'Move card') }}
-		</NcActionButton>
-		<NcActionButton v-if="canEdit"
-			:close-after-click="true"
-			@click="openCardCloneDialog">
-			<template #icon>
-				<CloneIcon :size="20" decorative />
-			</template>
-			{{ t('deck', 'Clone card') }}
+			{{ t('deck', 'Move/copy card') }}
 		</NcActionButton>
 		<NcActionButton v-for="action in cardActions"
 			:key="action.label"
@@ -66,7 +58,6 @@
 import { NcActionButton } from '@nextcloud/vue'
 import { mapGetters, mapState } from 'vuex'
 import ArchiveIcon from 'vue-material-design-icons/Archive.vue'
-import CloneIcon from 'vue-material-design-icons/ContentCopy.vue'
 import CardBulletedIcon from 'vue-material-design-icons/CardBulleted.vue'
 import { generateUrl } from '@nextcloud/router'
 import { getCurrentUser } from '@nextcloud/auth'
@@ -77,7 +68,7 @@ import { emit } from '@nextcloud/event-bus'
 
 export default {
 	name: 'CardMenuEntries',
-	components: { CloneIcon, NcActionButton, ArchiveIcon, CardBulletedIcon },
+	components: { NcActionButton, ArchiveIcon, CardBulletedIcon },
 	props: {
 		card: {
 			type: Object,
@@ -177,9 +168,6 @@ export default {
 		openCardMoveDialog() {
 			emit('deck:card:show-move-dialog', this.card)
 		},
-		openCardCloneDialog() {
-			emit('deck:card:show-clone-dialog', this.card)
-		},
 	},
 }
 </script>

From 60b7357ef41023ef3bcff5e0b4f7d04c43068038 Mon Sep 17 00:00:00 2001
From: grnd-alt <git@belakkaf.net>
Date: Thu, 19 Dec 2024 14:05:32 +0100
Subject: [PATCH 11/12] enh: make clone function use ocs

Signed-off-by: grnd-alt <git@belakkaf.net>
---
 appinfo/routes.php          | 3 ++-
 cypress/e2e/cardFeatures.js | 4 ++--
 src/services/CardApi.js     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index d56023645..0fec8568e 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -43,7 +43,6 @@
 		['name' => 'card#read', 'url' => '/cards/{cardId}', 'verb' => 'GET'],
 		['name' => 'card#create', 'url' => '/cards', 'verb' => 'POST'],
 		['name' => 'card#update', 'url' => '/cards/{cardId}', 'verb' => 'PUT'],
-		['name' => 'card#clone', 'url' => '/cards/{cardId}/clone', 'verb' => 'POST'],
 		['name' => 'card#delete', 'url' => '/cards/{cardId}', 'verb' => 'DELETE'],
 		['name' => 'card#deleted', 'url' => '/{boardId}/cards/deleted', 'verb' => 'GET'],
 		['name' => 'card#rename', 'url' => '/cards/{cardId}/rename', 'verb' => 'PUT'],
@@ -138,6 +137,8 @@
 		['name' => 'comments_api#update', 'url' => '/api/v{apiVersion}/cards/{cardId}/comments/{commentId}', 'verb' => 'PUT'],
 		['name' => 'comments_api#delete', 'url' => '/api/v{apiVersion}/cards/{cardId}/comments/{commentId}', 'verb' => 'DELETE'],
 
+		['name' => 'card#clone', 'url' => '/api/v{apiVersion}/cards/{cardId}/clone', 'verb' => 'POST'],
+
 		['name' => 'overview_api#upcomingCards', 'url' => '/api/v{apiVersion}/overview/upcoming', 'verb' => 'GET'],
 
 		['name' => 'search#search', 'url' => '/api/v{apiVersion}/search', 'verb' => 'GET'],
diff --git a/cypress/e2e/cardFeatures.js b/cypress/e2e/cardFeatures.js
index 5d5115c3d..c1628c986 100644
--- a/cypress/e2e/cardFeatures.js
+++ b/cypress/e2e/cardFeatures.js
@@ -303,8 +303,8 @@ describe('Card', function () {
 			})
 		})
 
-		it('clone card', () => {
-			cy.intercept({ method: 'POST', url: '**/apps/deck/cards/*/clone' }).as('clone')
+		it.only('clone card', () => {
+			cy.intercept({ method: 'POST', url: '**/apps/deck/**/cards/*/clone' }).as('clone')
 			cy.get('.card:contains("Hello world")').should('be.visible').click()
 			cy.get('#app-sidebar-vue')
 				.find('.ProseMirror h1').contains('Hello world').should('be.visible')
diff --git a/src/services/CardApi.js b/src/services/CardApi.js
index a25182c99..15031aa1d 100644
--- a/src/services/CardApi.js
+++ b/src/services/CardApi.js
@@ -4,7 +4,7 @@
  */
 
 import axios from '@nextcloud/axios'
-import { generateUrl } from '@nextcloud/router'
+import { generateOcsUrl, generateUrl } from '@nextcloud/router'
 
 export class CardApi {
 
@@ -29,7 +29,7 @@ export class CardApi {
 	}
 
 	cloneCard(cardId, targetStackId) {
-		return axios.post(this.url(`/cards/${cardId}/clone`), {
+		return axios.post(generateOcsUrl(`apps/deck/api/v1.0/cards/${cardId}/clone`), {
 			targetStackId,
 		})
 			.then(

From 5aeebc1ed8cd6816990c6676041355813cc95fd5 Mon Sep 17 00:00:00 2001
From: Julius Knorr <jus@bitgrid.net>
Date: Thu, 19 Dec 2024 14:49:35 +0100
Subject: [PATCH 12/12] chore: Move from NcModal to NcDialog

Signed-off-by: Julius Knorr <jus@bitgrid.net>
---
 cypress/e2e/cardFeatures.js |  4 ++--
 src/CardMoveDialog.vue      | 37 ++++++++-----------------------------
 2 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/cypress/e2e/cardFeatures.js b/cypress/e2e/cardFeatures.js
index c1628c986..0e86f5b28 100644
--- a/cypress/e2e/cardFeatures.js
+++ b/cypress/e2e/cardFeatures.js
@@ -303,7 +303,7 @@ describe('Card', function () {
 			})
 		})
 
-		it.only('clone card', () => {
+		it('clone card', () => {
 			cy.intercept({ method: 'POST', url: '**/apps/deck/**/cards/*/clone' }).as('clone')
 			cy.get('.card:contains("Hello world")').should('be.visible').click()
 			cy.get('#app-sidebar-vue')
@@ -311,7 +311,7 @@ describe('Card', function () {
 
 			cy.get('.app-sidebar-header .action-item__menutoggle').click()
 			cy.get('.v-popper__popper button:contains("Move/copy card")').click()
-			cy.get('.modal__content button:contains("Copy card")').click()
+			cy.get('.modal-container button:contains("Copy card")').click()
 			cy.wait('@clone', { timeout: 7000 })
 			cy.get('.card:contains("Hello world")').should('have.length', 2)
 		})
diff --git a/src/CardMoveDialog.vue b/src/CardMoveDialog.vue
index aa0389b99..c7d5d6fba 100644
--- a/src/CardMoveDialog.vue
+++ b/src/CardMoveDialog.vue
@@ -3,9 +3,8 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<NcModal v-if="modalShow" :title="t('deck', 'Move card to another board')" @close="modalShow = false">
+	<NcDialog :open.sync="modalShow" :name="t('deck', 'Move/copy card')">
 		<div class="modal__content">
-			<h3>{{ t('deck', 'Move/copy card to another board') }}</h3>
 			<NcSelect v-model="selectedBoard"
 				:input-label="t('deck', 'Select a board')"
 				:placeholder="t('deck', 'Select a board')"
@@ -20,22 +19,20 @@
 				:options="stacksFromBoard"
 				:max-height="100"
 				label="title" />
-
-			<NcButton :disabled="!isBoardAndStackChoosen" type="primary" @click="moveCard">
+		</div>
+		<template #actions>
+			<NcButton :disabled="!isBoardAndStackChoosen" type="secondary" @click="moveCard">
 				{{ t('deck', 'Move card') }}
 			</NcButton>
 			<NcButton :disabled="!isBoardAndStackChoosen" type="primary" @click="cloneCard">
 				{{ t('deck', 'Copy card') }}
 			</NcButton>
-			<NcButton @click="modalShow = false">
-				{{ t('deck', 'Cancel') }}
-			</NcButton>
-		</div>
-	</NcModal>
+		</template>
+	</NcDialog>
 </template>
 
 <script>
-import { NcModal, NcSelect, NcButton } from '@nextcloud/vue'
+import { NcDialog, NcSelect, NcButton } from '@nextcloud/vue'
 import { generateUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
@@ -43,7 +40,7 @@ import { mapGetters } from 'vuex'
 
 export default {
 	name: 'CardMoveDialog',
-	components: { NcModal, NcSelect, NcButton },
+	components: { NcDialog, NcSelect, NcButton },
 	data() {
 		return {
 			card: null,
@@ -104,26 +101,8 @@ export default {
 
 <style lang="scss" scoped>
 .modal__content {
-	min-width: 250px;
-	min-height: 120px;
-	margin: 20px 20px 100px 20px;
-
-	h3 {
-		font-weight: bold;
-		text-align: center;
-	}
-
 	.select {
 		margin-bottom: 12px;
 	}
 }
-
-button{
-	margin-left: 6px;
-}
-
-.modal__content button {
-	float: right;
-	margin-top: 50px;
-}
 </style>