ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Keep 18 compatibility

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-08-20 17:38:33 +02:00
parent 7faa40a20e
commit 5536188892
9 changed files with 565 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Search/BoardSearchResultEntry.php
View File

@@ -26,12 +26,10 @@ declare(strict_types=1);
namespace OCA\Deck\Search;
use OCA\Deck\Db\Board;
use OCP\Search\SearchResultEntry;
class BoardSearchResultEntry extends SearchResultEntry {
public function __construct(Board $board, $urlGenerator) {
parent::__construct(
'',

2
lib/Search/CardSearchResultEntry.php
View File

@@ -26,14 +26,12 @@ declare(strict_types=1);
namespace OCA\Deck\Search;
use OCA\Deck\Db\Board;
use OCA\Deck\Db\Card;
use OCA\Deck\Db\Stack;
use OCP\Search\SearchResultEntry;
class CardSearchResultEntry extends SearchResultEntry {
public function __construct(Board $board, Stack $stack, Card $card, $urlGenerator) {
parent::__construct('', $card->getTitle(), $board->getTitle() . ' » ' . $stack->getTitle() , $urlGenerator->linkToRoute('deck.page.index') . '#/board/' . $board->getId() . '/card/' . $card->getId(), 'icon-deck');
}

24
lib/Search/DeckProvider.php
View File

@@ -26,7 +26,6 @@ declare(strict_types=1);
namespace OCA\Deck\Search;
use OCA\Deck\Db\Board;
use OCA\Deck\Db\Card;
use OCA\Deck\Db\CardMapper;
@@ -69,9 +68,6 @@ class DeckProvider implements IProvider {
$this->urlGenerator = $urlGenerator;
}
/**
* @inheritDoc
*/
public function getId(): string {
return 'deck';
}
@@ -80,12 +76,14 @@ class DeckProvider implements IProvider {
return 'Deck';
}
/**
* @inheritDoc
*/
public function search(IUser $user, ISearchQuery $query): SearchResult {
$boards = $this->boardService->findAll();
$cards = $this->cardMapper->search(array_map(function (Board $board) {
$boards = $this->boardService->getUserBoards();
$matchedBoards = array_filter($this->getUserBoards(-1), static function (Board $board) use ($query) {
return mb_stripos($board->getTitle(), $query->getTerm()) > -1;
});
$matchedCards = $this->cardMapper->search(array_map(static function (Board $board) {
return $board->getId();
}, $boards), $query->getTerm(), $query->getLimit(), $query->getCursor());
@@ -93,14 +91,13 @@ class DeckProvider implements IProvider {
$results = array_merge(
array_map(function (Board $board) {
return new BoardSearchResultEntry($board, $this->urlGenerator);
}, array_filter($boards, function($board) use ($query) {
return mb_strpos($board->getTitle(), $query->getTerm()) !== -1;
})),
}, $matchedBoards),
array_map(function (Card $card) use ($self) {
$board = $self->boardService->find($self->cardMapper->findBoardId($card->getId()));
$stack = $self->stackMapper->find($card->getStackId());
return new CardSearchResultEntry($board, $stack, $card, $this->urlGenerator);
}, $cards)
}, $matchedCards)
);
return SearchResult::complete(
@@ -111,7 +108,6 @@ class DeckProvider implements IProvider {
public function getOrder(string $route, array $routeParameters): int {
if ($route === 'deck.page.index') {
// Before comments
return -5;
}
return 10;