Skip to content

Commit

Permalink
Merge pull request #5625 from nextcloud/feat/team-provider
Browse files Browse the repository at this point in the history
feat: Implement a team resource provider
  • Loading branch information
mejo- authored Mar 6, 2024
2 parents 2f5a479 + d90d0a5 commit 044706f
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 4 deletions.
8 changes: 4 additions & 4 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions img/deck-current.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
use OCA\Deck\Service\PermissionService;
use OCA\Deck\Sharing\DeckShareProvider;
use OCA\Deck\Sharing\Listener;
use OCA\Deck\Teams\DeckTeamResourceProvider;
use OCA\Text\Event\LoadEditor;
use OCP\AppFramework\App;
use OCP\AppFramework\Bootstrap\IBootContext;
Expand Down Expand Up @@ -179,6 +180,8 @@ public function register(IRegistrationContext $context): void {

$context->registerNotifierService(Notifier::class);
$context->registerEventListener(LoadAdditionalScriptsEvent::class, ResourceAdditionalScriptsListener::class);

$context->registerTeamResourceProvider(DeckTeamResourceProvider::class);
}

public function registerCommentsEntity(IEventDispatcher $eventDispatcher): void {
Expand Down
45 changes: 45 additions & 0 deletions lib/Db/BoardMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,51 @@ public function findAllByCircles(string $userId, ?int $limit = null, ?int $offse
return $entries;
}

public function findAllByTeam(string $teamId): array {
$qb = $this->db->getQueryBuilder();
$qb->select('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified')
->from('deck_boards', 'b')
->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
->where($qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_CIRCLE, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('acl.participant', $qb->createNamedParameter($teamId, IQueryBuilder::PARAM_STR)));
$entries = $this->findEntities($qb);
foreach ($entries as $entry) {
$entry->setShared(2);
}
return $entries;
}

public function findTeamsForBoard(int $boardId): array {
$qb = $this->db->getQueryBuilder();
$qb->select('acl.participant')
->from('deck_boards', 'b')
->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
->where($qb->expr()->eq('b.id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_CIRCLE, IQueryBuilder::PARAM_INT)));

$result = $qb->executeQuery();
return array_map(function ($entry) {
return $entry['participant'];
}, $result->fetchAll());
}

public function isSharedWithTeam(int $boardId, string $teamId): bool {
$qb = $this->db->getQueryBuilder();
$qb->select('b.id', 'title', 'owner', 'color', 'archived', 'deleted_at', 'last_modified')
->from('deck_boards', 'b')
->innerJoin('b', 'deck_board_acl', 'acl', $qb->expr()->eq('b.id', 'acl.board_id'))
->where($qb->expr()->eq('b.id', $qb->createNamedParameter($boardId, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('acl.type', $qb->createNamedParameter(Acl::PERMISSION_TYPE_CIRCLE, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('acl.participant', $qb->createNamedParameter($teamId, IQueryBuilder::PARAM_STR)));
try {
$this->findEntity($qb);
return true;
} catch (DoesNotExistException $e) {
// Expected return falue
}
return false;
}

public function findAll(): array {
$qb = $this->db->getQueryBuilder();
$qb->select('id')
Expand Down
80 changes: 80 additions & 0 deletions lib/Teams/DeckTeamResourceProvider.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?php

declare(strict_types=1);

namespace OCA\Deck\Teams;

use OCA\Deck\AppInfo\Application;
use OCA\Deck\Db\Board;
use OCA\Deck\Db\BoardMapper;
use OCP\IURLGenerator;
use OCP\Teams\TeamResource;

/**
* @copyright Copyright (c) 2024 Julius Härtl <[email protected]>
*
* @author Julius Härtl <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

class DeckTeamResourceProvider implements \OCP\Teams\ITeamResourceProvider {

public function __construct(
private BoardMapper $boardMapper,
private IURLGenerator $urlGenerator,
) {
}


public function getId(): string {
return Application::APP_ID;
}

public function getName(): string {
return 'Deck';
}

public function getIconSvg(): string {
return file_get_contents(__DIR__ . '/../../img/deck-current.svg');
}

public function getSharedWith($teamId): array {
$boards = $this->boardMapper->findAllByTeam($teamId);
return array_map(function (Board $board) {
return new TeamResource(
$this,
(string)$board->getId(),
$board->getTitle(),
$this->urlGenerator->linkToRouteAbsolute('deck.page.index') . '#/board/' . $board->getId(),
$this->getBoardBulletIcon($board),
$this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('deck', 'deck-current.svg')),
);
}, $boards);
}

public function isSharedWithTeam(string $teamId, string $resourceId): bool {
return $this->boardMapper->isSharedWithTeam((int)$resourceId, $teamId);
}

public function getTeamsForResource(string $resourceId): array {
return $this->boardMapper->findTeamsForBoard((int)$resourceId);
}

public function getBoardBulletIcon(Board $board): string {
return '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 16 16"><g fill="#' . $board->getColor(). '"><rect ry="15" height="14" width="14" y="1" x="1"/></g></svg>';
}
}

0 comments on commit 044706f

Please sign in to comment.