Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@

['name' => 'card_ocs#create', 'url' => '/api/v{apiVersion}/cards', 'verb' => 'POST'],
['name' => 'card_ocs#update', 'url' => '/api/v{apiVersion}/cards/{cardId}', 'verb' => 'PUT'],
['name' => 'card_ocs#assignLabel', 'url' => '/api/v{apiVersion}/cards/{cardId}/label/{labelId}', 'verb' => 'POST'],
['name' => 'card_ocs#removeLabel', 'url' => '/api/v{apiVersion}/cards/{cardId}/label/{labelId}', 'verb' => 'DELETE'],

['name' => 'stack_ocs#create', 'url' => '/api/v{apiVersion}/stacks', 'verb' => 'POST'],
['name' => 'stack_ocs#delete', 'url' => '/api/v{apiVersion}/stacks/{stackId}/{boardId}', 'verb' => 'DELETE', 'defaults' => ['boardId' => null]],
Expand Down
29 changes: 29 additions & 0 deletions lib/Controller/CardOcsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,35 @@ public function create(string $title, int $stackId, ?int $boardId = null, ?strin
return new DataResponse($card);
}


#[NoAdminRequired]
#[PublicPage]
#[NoCSRFRequired]
public function assignLabel(?int $boardId, int $cardId, int $labelId): DataResponse {
if ($boardId) {
$board = $this->boardService->find($boardId, false);
if ($board->getExternalId()) {
return new DataResponse($this->externalBoardService->assignLabelOnRemote($board, $cardId, $labelId));
}
}

return new DataResponse($this->cardService->assignLabel($cardId, $labelId));
}

#[NoAdminRequired]
#[PublicPage]
#[NoCSRFRequired]
public function removeLabel(?int $boardId, int $cardId, int $labelId): DataResponse {
if ($boardId) {
$board = $this->boardService->find($boardId, false);
if ($board->getExternalId()) {
return new DataResponse($this->externalBoardService->removeLabelOnRemote($board, $cardId, $labelId));
}
}

return new DataResponse($this->cardService->removeLabel($cardId, $labelId));
}

#[NoAdminRequired]
#[PublicPage]
#[NoCSRFRequired]
Expand Down
24 changes: 24 additions & 0 deletions lib/Service/ExternalBoardService.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,30 @@ public function updateCardOnRemote(
return $this->proxy->getOcsData($resp);
}

public function assignLabelOnRemote(Board $localBoard, int $cardId, int $labelId): array {
$this->configService->ensureFederationEnabled();
$this->permissionService->checkPermission($this->boardMapper, $localBoard->getId(), Acl::PERMISSION_EDIT, $this->userId, false, false);
$shareToken = $localBoard->getShareToken();
$ownerCloudId = $this->cloudIdManager->resolveCloudId($localBoard->getOwner());
$url = $ownerCloudId->getRemote() . '/ocs/v2.php/apps/deck/api/v1.0/cards/' . $cardId . '/label/' . $labelId;
$resp = $this->proxy->post($ownerCloudId->getId(), $shareToken, $url, [
'boardId' => $localBoard->getExternalId(),
]);
return $this->proxy->getOcsData($resp);
}

public function removeLabelOnRemote(Board $localBoard, int $cardId, int $labelId): array {
$this->configService->ensureFederationEnabled();
$this->permissionService->checkPermission($this->boardMapper, $localBoard->getId(), Acl::PERMISSION_EDIT, $this->userId, false, false);
$shareToken = $localBoard->getShareToken();
$ownerCloudId = $this->cloudIdManager->resolveCloudId($localBoard->getOwner());
$url = $ownerCloudId->getRemote() . '/ocs/v2.php/apps/deck/api/v1.0/cards/' . $cardId . '/label/' . $labelId;
$resp = $this->proxy->delete($ownerCloudId->getId(), $shareToken, $url, [
'boardId' => $localBoard->getExternalId(),
]);
return $this->proxy->getOcsData($resp);
}

public function createStackOnRemote(
Board $localBoard,
string $title,
Expand Down
1 change: 1 addition & 0 deletions src/components/card/CardSidebarTabDetails.vue
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ export default {
const data = {
card: this.copiedCard,
labelId: newLabel.id,
boardId: this.copiedCard.boardId,
}
this.$store.dispatch('addLabel', data)
},
Expand Down
12 changes: 8 additions & 4 deletions src/services/CardApi.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,10 @@ export class CardApi {
}

assignLabelToCard(data) {
return axios.post(this.url(`/cards/${data.card.id}/label/${data.labelId}`))
return axios.post(this.ocsUrl(`/cards/${data.card.id}/label/${data.labelId}`), { boardId: data.boardId ? data.boardId : null })
.then(
(response) => {
return Promise.resolve(response.data)
return Promise.resolve(response.data.ocs.data)
},
(err) => {
return Promise.reject(err)
Expand All @@ -216,10 +216,14 @@ export class CardApi {
}

removeLabelFromCard(data) {
return axios.delete(this.url(`/cards/${data.card.id}/label/${data.labelId}`))
return axios.delete(this.ocsUrl(`/cards/${data.card.id}/label/${data.labelId}`), {
data: {
boardId: data.boardId ? data.boardId : null,
},
})
.then(
(response) => {
return Promise.resolve(response.data)
return Promise.resolve(response.data.ocs.data)
},
(err) => {
return Promise.reject(err)
Expand Down
2 changes: 2 additions & 0 deletions src/store/card.js
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,12 @@ export default function cardModuleFactory() {
commit('removeUserFromCard', user)
},
async addLabel({ commit }, data) {
data.boardId = this.state.currentBoard.id
await apiClient.assignLabelToCard(data)
commit('updateCardProperty', { property: 'labels', card: data.card })
},
async removeLabel({ commit }, data) {
data.boardId = this.state.currentBoard.id
await apiClient.removeLabelFromCard(data)
commit('updateCardProperty', { property: 'labels', card: data.card })
},
Expand Down
Loading