Skip to content

feat: add card dependencies #7879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luka-nextcloud wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add card dependencies #7879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions appinfo/routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
['name' => 'card#removeLabel', 'url' => '/cards/{cardId}/label/{labelId}', 'verb' => 'DELETE'],
['name' => 'card#assignUser', 'url' => '/cards/{cardId}/assign', 'verb' => 'POST'],
['name' => 'card#unassignUser', 'url' => '/cards/{cardId}/unassign', 'verb' => 'PUT'],
['name' => 'card#assignDependentCard', 'url' => '/cards/{cardId}/dependentCards/{dependentCardId}', 'verb' => 'POST'],
['name' => 'card#removeDependentCard', 'url' => '/cards/{cardId}/dependentCards/{dependentCardId}', 'verb' => 'DELETE'],

// attachments
['name' => 'attachment#getAll', 'url' => '/cards/{cardId}/attachments', 'verb' => 'GET'],
Expand Down Expand Up @@ -105,6 +107,8 @@
['name' => 'card_api#assignUser', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/assignUser', 'verb' => 'PUT'],
['name' => 'card_api#unassignUser', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/unassignUser', 'verb' => 'PUT'],
['name' => 'card_api#reorder', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/reorder', 'verb' => 'PUT'],
['name' => 'card_api#assignDependentCard', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/dependentCards/{dependentCardId}', 'verb' => 'POST'],
['name' => 'card_api#removeDependentCard', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/dependentCards/{dependentCardId}', 'verb' => 'DELETE'],
['name' => 'card_api#archive', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/archive', 'verb' => 'PUT'],
['name' => 'card_api#unarchive', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}/unarchive', 'verb' => 'PUT'],
['name' => 'card_api#delete', 'url' => '/api/v{apiVersion}/boards/{boardId}/stacks/{stackId}/cards/{cardId}', 'verb' => 'DELETE'],
Expand Down Expand Up @@ -146,6 +150,8 @@
['name' => 'card_ocs#unAssignUser', 'url' => '/api/v{apiVersion}/cards/{cardId}/unassign', 'verb' => 'PUT'],
['name' => 'card_ocs#removeLabel', 'url' => '/api/v{apiVersion}/cards/{cardId}/label/{labelId}', 'verb' => 'DELETE'],
['name' => 'card_ocs#reorder', 'url' => '/api/v{apiVersion}/cards/{cardId}/reorder', 'verb' => 'PUT'],
['name' => 'card_ocs#assignDependentCard', 'url' => '/api/v{apiVersion}/cards/{cardId}/dependentCards/{dependentCardId}', 'verb' => 'POST'],
['name' => 'card_ocs#removeDependentCard', 'url' => '/api/v{apiVersion}/cards/{cardId}/dependentCards/{dependentCardId}', 'verb' => 'DELETE'],

['name' => 'stack_ocs#create', 'url' => '/api/v{apiVersion}/stacks', 'verb' => 'POST'],
['name' => 'stack_ocs#setDoneStack', 'url' => '/api/v{apiVersion}/stacks/{stackId}/done', 'verb' => 'PUT'],
Expand Down
6 changes: 5 additions & 1 deletion cypress/e2e/cardFeatures.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,14 @@ describe('Card', function () {

cy.reload()
cy.get('.modal__card').should('be.visible')

// Scroll to the bottom to ensure all content is loaded and visible
cy.get('.modal__card .app-sidebar-tabs, .modal__card .app-sidebar__tab--active').first().scrollTo('bottom', { ensureScrollable: false })
cy.contains('.modal__card .ProseMirror p', 'Paragraph').scrollIntoView().should('be.visible')

cy.get('.modal__card .ProseMirror h1').contains('Hello world writing more text').should('be.visible')
cy.get('.modal__card .ProseMirror li').eq(0).contains('List item').should('be.visible')
cy.get('.modal__card .ProseMirror li').eq(1).contains('with entries').should('be.visible')
cy.get('.modal__card .ProseMirror p').contains('Paragraph').should('be.visible')
})

it('Smart picker', () => {
Expand Down
22 changes: 22 additions & 0 deletions lib/Controller/CardApiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,28 @@ public function unassignUser(int $cardId, string $userId, int $type = 0): DataRe
return new DataResponse($card, HTTP::STATUS_OK);
}

/**
* Assign a dependent card
*/
#[NoAdminRequired]
#[CORS]
#[NoCSRFRequired]
public function assignDependentCard(int $cardId, int $dependentCardId): DataResponse {
$card = $this->cardService->assignDependentCard($cardId, $dependentCardId);
return new DataResponse($card, HTTP::STATUS_OK);
}

/**
* Remove a dependent card
*/
#[NoAdminRequired]
#[CORS]
#[NoCSRFRequired]
public function removeDependentCard(int $cardId, int $dependentCardId): DataResponse {
$card = $this->cardService->removeDependentCard($cardId, $dependentCardId);
return new DataResponse($card, HTTP::STATUS_OK);
}

/**
* Archive card
*/
Expand Down
10 changes: 10 additions & 0 deletions lib/Controller/CardController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,14 @@ public function assignUser(int $cardId, string $userId, int $type = 0): Assignme
public function unassignUser(int $cardId, string $userId, int $type = 0): Assignment {
return $this->assignmentService->unassignUser($cardId, $userId, $type);
}

#[NoAdminRequired]
public function assignDependentCard(int $cardId, int $dependentCardId): Card {
return $this->cardService->assignDependentCard($cardId, $dependentCardId);
}

#[NoAdminRequired]
public function removeDependentCard(int $cardId, int $dependentCardId): Card {
return $this->cardService->removeDependentCard($cardId, $dependentCardId);
}
}
25 changes: 25 additions & 0 deletions lib/Controller/CardOcsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
namespace OCA\Deck\Controller;

use OCA\Deck\Model\OptionalNullableValue;
use OCA\Deck\NotImplementedException;
use OCA\Deck\Service\AssignmentService;
use OCA\Deck\Service\BoardService;
use OCA\Deck\Service\CardService;
Expand Down Expand Up @@ -170,4 +171,28 @@ public function reorder(int $cardId, int $stackId, int $order, ?int $boardId): D
}
return new DataResponse($this->cardService->reorder($cardId, $stackId, $order));
}

#[NoAdminRequired]
#[PublicPage]
public function assignDependentCard(int $cardId, int $dependentCardId, ?int $boardId = null): DataResponse {
if ($boardId) {
$board = $this->boardService->find($boardId, false);
if ($board->getExternalId()) {
throw new NotImplementedException('Dependent cards are not supported for external boards');
}
}
return new DataResponse($this->cardService->assignDependentCard($cardId, $dependentCardId));
}

#[NoAdminRequired]
#[PublicPage]
public function removeDependentCard(int $cardId, int $dependentCardId, ?int $boardId = null): DataResponse {
if ($boardId) {
$board = $this->boardService->find($boardId, false);
if ($board->getExternalId()) {
// External board support can be added later if needed
Copy link
Copy Markdown
Member

@grnd-alt grnd-alt May 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this also has to throw notImplemented

}
}
return new DataResponse($this->cardService->removeDependentCard($cardId, $dependentCardId));
}
}
5 changes: 5 additions & 0 deletions lib/Db/Card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
* @method ?DateTime getStartdate()
* @method void setStartdate(?DateTime $startdate)
*
* @method void setDependentCards(array $cardIds)
* @method null|array getDependentCards()
*
* @method void setLabels(Label[] $labels)
* @method null|Label[] getLabels()
*
Expand Down Expand Up @@ -90,6 +93,7 @@ class Card extends RelationalEntity {
protected $deletedAt = 0;
protected $commentsUnread = 0;
protected $commentsCount = 0;
protected ?array $dependentCards = null;

protected $relatedStack = null;
protected $relatedBoard = null;
Expand All @@ -113,6 +117,7 @@ public function __construct() {
$this->addType('deletedAt', 'integer');
$this->addType('duedate', 'datetime');
$this->addType('startdate', 'datetime');
$this->addRelation('dependentCards');
$this->addRelation('labels');
$this->addRelation('assignedUsers');
$this->addRelation('attachments');
Expand Down
71 changes: 71 additions & 0 deletions lib/Db/CardMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,7 @@ public function searchRaw($boardIds, $term, $limit = null, $offset = null) {

public function delete(Entity $entity): Entity {
$this->labelMapper->deleteLabelAssignmentsForCard($entity->getId());
$this->removeDependenciesForCard($entity->getId());
$this->cache->remove('findBoardId:' . $entity->getId());
return parent::delete($entity);
}
Expand Down Expand Up @@ -643,6 +644,76 @@ public function removeLabel(int $card, int $label): void {
$qb->executeStatement();
}

/**
* @param int[] $cardIds
* @return array<int, int[]>
*/
public function findDependenciesForCards(array $cardIds): array {
if ($cardIds === []) {
return [];
}

$qb = $this->db->getQueryBuilder();
$qb->select('card_id', 'dependent_card_id')
->from('deck_dependent_cards')
->where($qb->expr()->in('card_id', $qb->createNamedParameter($cardIds, IQueryBuilder::PARAM_INT_ARRAY)))
->orderBy('card_id')
->addOrderBy('dependent_card_id');

$result = [];
$queryResult = $qb->executeQuery();
while ($row = $queryResult->fetch()) {
$cardId = (int)$row['card_id'];
$result[$cardId][] = (int)$row['dependent_card_id'];
}

return $result;
}

public function addDependency(int $cardId, int $dependentCardId): bool {
if ($this->hasDependency($cardId, $dependentCardId)) {
return false;
}

$qb = $this->db->getQueryBuilder();
$qb->insert('deck_dependent_cards')
->values([
'card_id' => $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT),
'dependent_card_id' => $qb->createNamedParameter($dependentCardId, IQueryBuilder::PARAM_INT),
]);
$qb->executeStatement();

return true;
}

public function removeDependency(int $cardId, int $dependentCardId): bool {
$qb = $this->db->getQueryBuilder();
$qb->delete('deck_dependent_cards')
->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('dependent_card_id', $qb->createNamedParameter($dependentCardId, IQueryBuilder::PARAM_INT)));

return $qb->executeStatement() > 0;
}

public function removeDependenciesForCard(int $cardId): void {
$qb = $this->db->getQueryBuilder();
$qb->delete('deck_dependent_cards')
->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)))
->orWhere($qb->expr()->eq('dependent_card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)));
$qb->executeStatement();
}

private function hasDependency(int $cardId, int $dependentCardId): bool {
$qb = $this->db->getQueryBuilder();
$qb->select('id')
->from('deck_dependent_cards')
->where($qb->expr()->eq('card_id', $qb->createNamedParameter($cardId, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('dependent_card_id', $qb->createNamedParameter($dependentCardId, IQueryBuilder::PARAM_INT)))
->setMaxResults(1);

return $qb->executeQuery()->fetchOne() !== false;
}

public function isOwner(string $userId, int $id): bool {
$qb = $this->db->getQueryBuilder();
$qb->select('c.id')
Expand Down
43 changes: 43 additions & 0 deletions lib/Migration/Version11002Date20260410000000.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?php

/**
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

declare(strict_types=1);
namespace OCA\Deck\Migration;

use Closure;
use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;

class Version11002Date20260410000000 extends SimpleMigrationStep {
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
$schema = $schemaClosure();

if (!$schema->hasTable('deck_dependent_cards')) {
$table = $schema->createTable('deck_dependent_cards');
$table->addColumn('id', 'integer', [
'autoincrement' => true,
'notnull' => true,
'length' => 4,
]);
$table->addColumn('card_id', 'integer', [
'notnull' => true,
'length' => 4,
'default' => 0,
]);
$table->addColumn('dependent_card_id', 'integer', [
'notnull' => true,
'length' => 4,
'default' => 0,
]);
$table->setPrimaryKey(['id']);
$table->addUniqueIndex(['card_id', 'dependent_card_id'], 'deck_depend_cards_uidx');
$table->addIndex(['card_id'], 'deck_depend_cards_idx_c');
$table->addIndex(['dependent_card_id'], 'deck_depend_cards_idx_d');
}
return $schema;
}
}
60 changes: 60 additions & 0 deletions lib/Service/CardService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public function enrichCards(array $cards): array {

$assignedLabels = $this->labelMapper->findAssignedLabelsForCards($cardIds);
$assignedUsers = $this->assignedUsersMapper->findIn($cardIds);
$dependenciesByCard = $this->cardMapper->findDependenciesForCards($cardIds);

// Pre-group labels and users by card ID
$labelsByCard = [];
Expand All @@ -114,6 +115,7 @@ public function enrichCards(array $cards): array {
foreach ($cards as $card) {
$card->setLabels($labelsByCard[$card->getId()] ?? []);
$card->setAssignedUsers($usersByCard[$card->getId()] ?? []);
$card->setDependentCards($dependenciesByCard[$card->getId()] ?? []);
}

return array_map(
Expand Down Expand Up @@ -675,4 +677,62 @@ public function getCardUrl(int $cardId): string {
public function getRedirectUrlForCard(int $cardId): string {
return $this->urlGenerator->linkToRouteAbsolute('deck.page.redirectToCard', ['cardId' => $cardId]);
}

/**
* @throws StatusException
* @throws \OCA\Deck\NoPermissionException
* @throws \OCP\AppFramework\Db\DoesNotExistException
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
* @throws BadRequestException
*/
public function assignDependentCard(int $cardId, int $dependentCardId): Card {
$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
$this->permissionService->checkPermission($this->cardMapper, $dependentCardId, Acl::PERMISSION_READ);

if ($this->boardService->isArchived($this->cardMapper, $cardId)) {
throw new StatusException('Operation not allowed. This board is archived.');
}

$card = $this->cardMapper->find($cardId);
if ($card->getArchived()) {
throw new StatusException('Operation not allowed. This card is archived.');
}

if ($this->cardMapper->addDependency($cardId, $dependentCardId)) {
$this->changeHelper->cardChanged($cardId);
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_UPDATE);
}

[$card] = $this->enrichCards([$card]);
return $card;
}

/**
* @throws StatusException
* @throws \OCA\Deck\NoPermissionException
* @throws \OCP\AppFramework\Db\DoesNotExistException
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
* @throws BadRequestException
*/
public function removeDependentCard(int $cardId, int $dependentCardId): Card {
$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
$this->permissionService->checkPermission($this->cardMapper, $dependentCardId, Acl::PERMISSION_READ);

if ($this->boardService->isArchived($this->cardMapper, $cardId)) {
throw new StatusException('Operation not allowed. This board is archived.');
}

$card = $this->cardMapper->find($cardId);
if ($card->getArchived()) {
throw new StatusException('Operation not allowed. This card is archived.');
}

if ($this->cardMapper->removeDependency($cardId, $dependentCardId)) {
$this->changeHelper->cardChanged($cardId);
$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_CARD, $card, ActivityManager::SUBJECT_CARD_UPDATE);
}

[$card] = $this->enrichCards([$card]);
return $card;
}
}
Loading
Loading