feat: Add possibility to clone cards when cloning a board
Signed-off-by: Max Bachhuber <max.bachhuber@bahuma.io> Adjust BoardServiceTest to new dependencies Signed-off-by: Max Bachhuber <max.bachhuber@bahuma.io> Add BoardCloneModal vue component to frontend. Adjust BoardApi and store to support clone options Signed-off-by: Max Bachhuber <max.bachhuber@bahuma.io> Add license and credits Signed-off-by: Max Bachhuber <max.bachhuber@bahuma.io> Fix PHP code style Signed-off-by: Max Bachhuber <max.bachhuber@bahuma.io> Change default clone settings Signed-off-by: Max Bachhuber <max.bachhuber@bahuma.io> Add accordion for advanced settings Signed-off-by: Max Bachhuber <max.bachhuber@bahuma.io> Fix bug which caused board to be cloned when clicking out of the modal Signed-off-by: Max Bachhuber <max.bachhuber@bahuma.io> Change wording of clone options Signed-off-by: Max Bachhuber <max.bachhuber@bahuma.io> fix: Rebase failures Signed-off-by: Julius Härtl <jus@bitgrid.net> update cloneBoards phpdoc make error message clear SPDX Header BoardCloneModal.vue Signed-off-by: grnd-alt <salimbelakkaf@outlook.de>
This commit is contained in:
Max Bachhuber
committed by
Julius Knorr
Julius Knorr
parent
bdaf28eef4
commit
f2c30afe8a
@@ -16,6 +16,7 @@ use OCA\Deck\Db\AclMapper;
|
||||
use OCA\Deck\Db\AssignmentMapper;
|
||||
use OCA\Deck\Db\Board;
|
||||
use OCA\Deck\Db\BoardMapper;
|
||||
use OCA\Deck\Db\Card;
|
||||
use OCA\Deck\Db\CardMapper;
|
||||
use OCA\Deck\Db\ChangeHelper;
|
||||
use OCA\Deck\Db\IPermissionMapper;
|
||||
@@ -29,6 +30,7 @@ use OCA\Deck\Event\AclCreatedEvent;
|
||||
use OCA\Deck\Event\AclDeletedEvent;
|
||||
use OCA\Deck\Event\AclUpdatedEvent;
|
||||
use OCA\Deck\Event\BoardUpdatedEvent;
|
||||
use OCA\Deck\Event\CardCreatedEvent;
|
||||
use OCA\Deck\NoPermissionException;
|
||||
use OCA\Deck\Notification\NotificationHelper;
|
||||
use OCA\Deck\Validators\BoardServiceValidator;
|
||||
@@ -38,80 +40,37 @@ use OCP\DB\Exception as DbException;
|
||||
use OCP\EventDispatcher\IEventDispatcher;
|
||||
use OCP\IConfig;
|
||||
use OCP\IDBConnection;
|
||||
use OCP\IGroupManager;
|
||||
use OCP\IL10N;
|
||||
use OCP\IURLGenerator;
|
||||
use OCP\IUserManager;
|
||||
use OCP\Server;
|
||||
use Psr\Container\ContainerExceptionInterface;
|
||||
use Psr\Container\NotFoundExceptionInterface;
|
||||
|
||||
class BoardService {
|
||||
private BoardMapper $boardMapper;
|
||||
private StackMapper $stackMapper;
|
||||
private LabelMapper $labelMapper;
|
||||
private AclMapper $aclMapper;
|
||||
private IConfig $config;
|
||||
private IL10N $l10n;
|
||||
private PermissionService $permissionService;
|
||||
private NotificationHelper $notificationHelper;
|
||||
private AssignmentMapper $assignedUsersMapper;
|
||||
private IUserManager $userManager;
|
||||
private IGroupManager $groupManager;
|
||||
private ?string $userId;
|
||||
private ActivityManager $activityManager;
|
||||
private IEventDispatcher $eventDispatcher;
|
||||
private ChangeHelper $changeHelper;
|
||||
private CardMapper $cardMapper;
|
||||
private ?array $boardsCacheFull = null;
|
||||
private ?array $boardsCachePartial = null;
|
||||
private IURLGenerator $urlGenerator;
|
||||
private IDBConnection $connection;
|
||||
private BoardServiceValidator $boardServiceValidator;
|
||||
private SessionMapper $sessionMapper;
|
||||
|
||||
public function __construct(
|
||||
BoardMapper $boardMapper,
|
||||
StackMapper $stackMapper,
|
||||
CardMapper $cardMapper,
|
||||
IConfig $config,
|
||||
IL10N $l10n,
|
||||
LabelMapper $labelMapper,
|
||||
AclMapper $aclMapper,
|
||||
PermissionService $permissionService,
|
||||
NotificationHelper $notificationHelper,
|
||||
AssignmentMapper $assignedUsersMapper,
|
||||
IUserManager $userManager,
|
||||
IGroupManager $groupManager,
|
||||
ActivityManager $activityManager,
|
||||
IEventDispatcher $eventDispatcher,
|
||||
ChangeHelper $changeHelper,
|
||||
IURLGenerator $urlGenerator,
|
||||
IDBConnection $connection,
|
||||
BoardServiceValidator $boardServiceValidator,
|
||||
SessionMapper $sessionMapper,
|
||||
?string $userId,
|
||||
private BoardMapper $boardMapper,
|
||||
private StackMapper $stackMapper,
|
||||
private CardMapper $cardMapper,
|
||||
private IConfig $config,
|
||||
private IL10N $l10n,
|
||||
private LabelMapper $labelMapper,
|
||||
private AclMapper $aclMapper,
|
||||
private PermissionService $permissionService,
|
||||
private AssignmentService $assignmentService,
|
||||
private NotificationHelper $notificationHelper,
|
||||
private AssignmentMapper $assignedUsersMapper,
|
||||
private ActivityManager $activityManager,
|
||||
private IEventDispatcher $eventDispatcher,
|
||||
private ChangeHelper $changeHelper,
|
||||
private IURLGenerator $urlGenerator,
|
||||
private IDBConnection $connection,
|
||||
private BoardServiceValidator $boardServiceValidator,
|
||||
private SessionMapper $sessionMapper,
|
||||
private ?string $userId,
|
||||
) {
|
||||
$this->boardMapper = $boardMapper;
|
||||
$this->stackMapper = $stackMapper;
|
||||
$this->cardMapper = $cardMapper;
|
||||
$this->labelMapper = $labelMapper;
|
||||
$this->config = $config;
|
||||
$this->aclMapper = $aclMapper;
|
||||
$this->l10n = $l10n;
|
||||
$this->permissionService = $permissionService;
|
||||
$this->notificationHelper = $notificationHelper;
|
||||
$this->assignedUsersMapper = $assignedUsersMapper;
|
||||
$this->userManager = $userManager;
|
||||
$this->groupManager = $groupManager;
|
||||
$this->activityManager = $activityManager;
|
||||
$this->eventDispatcher = $eventDispatcher;
|
||||
$this->changeHelper = $changeHelper;
|
||||
$this->userId = $userId;
|
||||
$this->urlGenerator = $urlGenerator;
|
||||
$this->connection = $connection;
|
||||
$this->boardServiceValidator = $boardServiceValidator;
|
||||
$this->sessionMapper = $sessionMapper;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -150,7 +109,7 @@ class BoardService {
|
||||
|
||||
/**
|
||||
* @throws DoesNotExistException
|
||||
* @throws \OCA\Deck\NoPermissionException
|
||||
* @throws NoPermissionException
|
||||
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
|
||||
* @throws BadRequestException
|
||||
*/
|
||||
@@ -177,7 +136,7 @@ class BoardService {
|
||||
* @param $id
|
||||
* @return bool
|
||||
* @throws DoesNotExistException
|
||||
* @throws \OCA\Deck\NoPermissionException
|
||||
* @throws NoPermissionException
|
||||
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
|
||||
* @throws BadRequestException
|
||||
*/
|
||||
@@ -204,7 +163,7 @@ class BoardService {
|
||||
* @param $id
|
||||
* @return bool
|
||||
* @throws DoesNotExistException
|
||||
* @throws \OCA\Deck\NoPermissionException
|
||||
* @throws NoPermissionException
|
||||
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
|
||||
* @throws BadRequestException
|
||||
*/
|
||||
@@ -281,7 +240,7 @@ class BoardService {
|
||||
* @param $id
|
||||
* @return Board
|
||||
* @throws DoesNotExistException
|
||||
* @throws \OCA\Deck\NoPermissionException
|
||||
* @throws NoPermissionException
|
||||
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
|
||||
* @throws BadRequestException
|
||||
*/
|
||||
@@ -305,7 +264,7 @@ class BoardService {
|
||||
* @param $id
|
||||
* @return \OCP\AppFramework\Db\Entity
|
||||
* @throws DoesNotExistException
|
||||
* @throws \OCA\Deck\NoPermissionException
|
||||
* @throws NoPermissionException
|
||||
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
|
||||
*/
|
||||
public function deleteUndo($id) {
|
||||
@@ -325,7 +284,7 @@ class BoardService {
|
||||
* @param $id
|
||||
* @return \OCP\AppFramework\Db\Entity
|
||||
* @throws DoesNotExistException
|
||||
* @throws \OCA\Deck\NoPermissionException
|
||||
* @throws NoPermissionException
|
||||
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
|
||||
* @throws BadRequestException
|
||||
*/
|
||||
@@ -346,7 +305,7 @@ class BoardService {
|
||||
* @param $archived
|
||||
* @return \OCP\AppFramework\Db\Entity
|
||||
* @throws DoesNotExistException
|
||||
* @throws \OCA\Deck\NoPermissionException
|
||||
* @throws NoPermissionException
|
||||
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
|
||||
* @throws BadRequestException
|
||||
*/
|
||||
@@ -411,7 +370,7 @@ class BoardService {
|
||||
* @param $manage
|
||||
* @return \OCP\AppFramework\Db\Entity
|
||||
* @throws BadRequestException
|
||||
* @throws \OCA\Deck\NoPermissionException
|
||||
* @throws NoPermissionException
|
||||
*/
|
||||
public function addAcl($boardId, $type, $participant, $edit, $share, $manage) {
|
||||
$this->boardServiceValidator->check(compact('boardId', 'type', 'participant', 'edit', 'share', 'manage'));
|
||||
@@ -455,7 +414,7 @@ class BoardService {
|
||||
* @param $manage
|
||||
* @return \OCP\AppFramework\Db\Entity
|
||||
* @throws DoesNotExistException
|
||||
* @throws \OCA\Deck\NoPermissionException
|
||||
* @throws NoPermissionException
|
||||
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
|
||||
* @throws BadRequestException
|
||||
*/
|
||||
@@ -519,15 +478,16 @@ class BoardService {
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $id
|
||||
* @param $userId
|
||||
* @return Board
|
||||
* @throws DoesNotExistException
|
||||
* @throws \OCA\Deck\NoPermissionException
|
||||
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
|
||||
* @throws BadRequestException
|
||||
* @throws DbException
|
||||
* @throws DoesNotExistException
|
||||
* @throws MultipleObjectsReturnedException
|
||||
* @throws NoPermissionException
|
||||
*/
|
||||
public function clone($id, $userId) {
|
||||
public function clone(
|
||||
int $id, string $userId,
|
||||
bool $withCards = false, bool $withAssignments = false, bool $withLabels = false, bool $withDueDate = false, bool $moveCardsToLeftStack = false, bool $restoreArchivedCards = false,
|
||||
): Board {
|
||||
$this->boardServiceValidator->check(compact('id', 'userId'));
|
||||
|
||||
if (!$this->permissionService->canCreate()) {
|
||||
@@ -550,6 +510,16 @@ class BoardService {
|
||||
]);
|
||||
$this->boardMapper->insert($newBoard);
|
||||
|
||||
foreach ($this->aclMapper->findAll($board->getId()) as $acl) {
|
||||
$this->addAcl($newBoard->getId(),
|
||||
$acl->getType(),
|
||||
$acl->getParticipant(),
|
||||
$acl->getPermissionEdit(),
|
||||
$acl->getPermissionShare(),
|
||||
$acl->getPermissionManage());
|
||||
}
|
||||
|
||||
|
||||
$labels = $this->labelMapper->findAll($id);
|
||||
foreach ($labels as $label) {
|
||||
$newLabel = new Label();
|
||||
@@ -572,6 +542,10 @@ class BoardService {
|
||||
$this->stackMapper->insert($newStack);
|
||||
}
|
||||
|
||||
if ($withCards) {
|
||||
$this->cloneCards($board, $newBoard, $withAssignments, $withLabels, $withDueDate, $moveCardsToLeftStack, $restoreArchivedCards);
|
||||
}
|
||||
|
||||
return $this->find($newBoard->getId());
|
||||
}
|
||||
|
||||
@@ -619,7 +593,7 @@ class BoardService {
|
||||
* @param $id
|
||||
* @return Board
|
||||
* @throws DoesNotExistException
|
||||
* @throws \OCA\Deck\NoPermissionException
|
||||
* @throws NoPermissionException
|
||||
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
|
||||
* @throws BadRequestException
|
||||
*/
|
||||
@@ -675,6 +649,83 @@ class BoardService {
|
||||
return $boards;
|
||||
}
|
||||
|
||||
private function cloneCards(Board $board, Board $newBoard, bool $withAssignments = false, bool $withLabels = false, bool $withDueDate = false, bool $moveCardsToLeftStack = false, bool $restoreArchivedCards = false): void {
|
||||
$stacks = $this->stackMapper->findAll($board->getId());
|
||||
$newStacks = $this->stackMapper->findAll($newBoard->getId());
|
||||
|
||||
$stackSorter = function (Stack $a, Stack $b) {
|
||||
return $a->getOrder() - $b->getOrder();
|
||||
};
|
||||
usort($stacks, $stackSorter);
|
||||
usort($newStacks, $stackSorter);
|
||||
|
||||
$i = 0;
|
||||
foreach ($stacks as $stack) {
|
||||
$cards = $this->cardMapper->findAll($stack->getId());
|
||||
$archivedCards = $this->cardMapper->findAllArchived($stack->getId());
|
||||
|
||||
/** @var Card[] $cards */
|
||||
$cards = array_merge($cards, $archivedCards);
|
||||
|
||||
foreach ($cards as $card) {
|
||||
$targetStackId = $moveCardsToLeftStack ? $newStacks[0]->getId() : $newStacks[$i]->getId();
|
||||
|
||||
// Create a cloned card.
|
||||
// Done with setters as only fields set via setters get written to db
|
||||
$newCard = new Card();
|
||||
$newCard->setTitle($card->getTitle());
|
||||
$newCard->setDescription($card->getDescription());
|
||||
$newCard->setStackId($targetStackId);
|
||||
$newCard->setType($card->getType());
|
||||
$newCard->setOwner($card->getOwner());
|
||||
$newCard->setOrder($card->getOrder());
|
||||
$newCard->setDuedate($withDueDate ? $card->getDuedate() : null);
|
||||
$newCard->setArchived($restoreArchivedCards ? false : $card->getArchived());
|
||||
$newCard->setStackId($targetStackId);
|
||||
|
||||
// Persist the cloned card.
|
||||
$newCard = $this->cardMapper->insert($newCard);
|
||||
|
||||
|
||||
// Copy labels.
|
||||
if ($withLabels) {
|
||||
$labels = $this->labelMapper->findAssignedLabelsForCard($card->getId());
|
||||
$newLabels = $this->labelMapper->findAll($newBoard->getId());
|
||||
$newLabelTitles = [];
|
||||
foreach ($newLabels as $label) {
|
||||
$newLabelTitles[$label->getTitle()] = $label;
|
||||
}
|
||||
|
||||
foreach ($labels as $label) {
|
||||
$newLabelId = $newLabelTitles[$label->getTitle()]?->getId() ?? null;
|
||||
if ($newLabelId) {
|
||||
$this->cardMapper->assignLabel($newCard->getId(), $newLabelId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Copy assignments.
|
||||
if ($withAssignments) {
|
||||
$assignments = $this->assignedUsersMapper->findAll($card->getId());
|
||||
|
||||
foreach ($assignments as $assignment) {
|
||||
$this->assignmentService->assignUser($newCard->getId(), $assignment->getParticipant(), $assignment->getType());
|
||||
}
|
||||
}
|
||||
|
||||
// Known limitation: Currently we do not copy attachments or comments
|
||||
|
||||
// Copied from CardService because CardService cannot be injected due to cyclic dependencies.
|
||||
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_CREATE);
|
||||
$this->changeHelper->cardChanged($card->getId(), false);
|
||||
$this->eventDispatcher->dispatchTyped(new CardCreatedEvent($card));
|
||||
}
|
||||
|
||||
$i++;
|
||||
}
|
||||
}
|
||||
|
||||
private function enrichWithStacks($board, $since = -1) {
|
||||
$stacks = $this->stackMapper->findAll($board->getId(), null, null, $since);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user