Skip to content

Commit

Permalink
perf: Already pass board list as initial state
Browse files Browse the repository at this point in the history
Signed-off-by: Julius Härtl <jus@bitgrid.net>
  • Loading branch information
juliusknorr committed Nov 13, 2023
1 parent 3ddc687 commit 2ce1c4b
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 18 deletions.
28 changes: 14 additions & 14 deletions lib/Controller/PageController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,36 @@

namespace OCA\Deck\Controller;

use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use \OCP\AppFramework\Http\RedirectResponse;
use OCA\Deck\AppInfo\Application;
use OCA\Deck\Db\Acl;
use OCA\Deck\Db\CardMapper;
use OCA\Deck\Service\BoardService;
use OCA\Deck\Service\CardService;
use OCA\Deck\Service\ConfigService;
use OCA\Deck\Service\PermissionService;
use OCA\Files\Event\LoadSidebar;
use OCA\Text\Event\LoadEditor;
use OCA\Viewer\Event\LoadViewer;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Services\IInitialState;
use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent as CollaborationResourcesEvent;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig;
use OCP\IInitialStateService;
use OCP\IRequest;
use OCP\IURLGenerator;

class PageController extends Controller {
private IInitialStateService $initialState;

public function __construct(
string $AppName,
IRequest $request,
private PermissionService $permissionService,
IInitialStateService $initialStateService,
private IInitialState $initialState,
private BoardService $boardService,
private ConfigService $configService,
private IEventDispatcher $eventDispatcher,
private CardMapper $cardMapper,
Expand All @@ -61,8 +61,6 @@ public function __construct(
private IConfig $config,
) {
parent::__construct($AppName, $request);

$this->initialState = $initialStateService;
}

/**
Expand All @@ -73,9 +71,11 @@ public function __construct(
* @NoCSRFRequired
*/
public function index() {
$this->initialState->provideInitialState(Application::APP_ID, 'maxUploadSize', (int)\OCP\Util::uploadLimit());
$this->initialState->provideInitialState(Application::APP_ID, 'canCreate', $this->permissionService->canCreate());
$this->initialState->provideInitialState(Application::APP_ID, 'config', $this->configService->getAll());
$this->initialState->provideInitialState('maxUploadSize', (int)\OCP\Util::uploadLimit());
$this->initialState->provideInitialState('canCreate', $this->permissionService->canCreate());
$this->initialState->provideInitialState('config', $this->configService->getAll());

$this->initialState->provideInitialState('initialBoards', $this->boardService->findAll());

$this->eventDispatcher->dispatchTyped(new LoadSidebar());
$this->eventDispatcher->dispatchTyped(new CollaborationResourcesEvent());
Expand Down Expand Up @@ -110,19 +110,19 @@ public function indexList(): TemplateResponse {
#[NoAdminRequired]
#[NoCSRFRequired]
public function indexBoard(int $boardId): TemplateResponse {
return $this->index($boardId);
return $this->index();
}

#[NoAdminRequired]
#[NoCSRFRequired]
public function indexBoardDetails(int $boardId): TemplateResponse {
return $this->index($boardId);
return $this->index();
}

#[NoAdminRequired]
#[NoCSRFRequired]
public function indexCard(int $cardId): TemplateResponse {
return $this->index(cardId: $cardId);
return $this->index();
}

/**
Expand Down
6 changes: 5 additions & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import AppNavigation from './components/navigation/AppNavigation.vue'
import { NcModal, NcContent, NcAppContent } from '@nextcloud/vue'
import { BoardApi } from './services/BoardApi.js'
import { emit, subscribe } from '@nextcloud/event-bus'
import { loadState } from '@nextcloud/initial-state'
const boardApi = new BoardApi()
Expand Down Expand Up @@ -108,7 +109,10 @@ export default {
},
},
created() {
this.$store.dispatch('loadBoards')
const initialState = loadState('deck', 'initialBoards', null)
if (initialState !== null) {
this.$store.dispatch('loadBoards')
}
this.$store.dispatch('loadSharees')
},
mounted() {
Expand Down
3 changes: 3 additions & 0 deletions src/components/navigation/AppNavigationBoardCategory.vue
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,8 @@ export default {
}
},
},
mounted() {
this.opened = this.boards.length > 0
},
}
</script>
2 changes: 1 addition & 1 deletion src/store/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export default new Vuex.Store({
sidebarShown: false,
currentBoard: null,
currentCard: null,
boards: [],
boards: loadState('deck', 'initialBoards', []),
sharees: [],
assignableUsers: [],
boardFilter: BOARD_FILTERS.ALL,
Expand Down
8 changes: 6 additions & 2 deletions tests/unit/controller/PageControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@
namespace OCA\Deck\Controller;

use OCA\Deck\Db\CardMapper;
use OCA\Deck\Service\BoardService;
use OCA\Deck\Service\CardService;
use OCA\Deck\Service\ConfigService;
use OCA\Deck\Service\PermissionService;
use OCP\AppFramework\Services\IInitialState;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig;
use OCP\IInitialStateService;
use OCP\IRequest;
use OCP\IURLGenerator;
use PHPUnit\Framework\TestCase;
Expand All @@ -40,6 +41,7 @@ class PageControllerTest extends TestCase {
private $request;
private $permissionService;
private $initialState;
private $boardService;
private $configService;
private $eventDispatcher;
/**
Expand All @@ -61,7 +63,8 @@ public function setUp(): void {
$this->request = $this->createMock(IRequest::class);
$this->permissionService = $this->createMock(PermissionService::class);
$this->configService = $this->createMock(ConfigService::class);
$this->initialState = $this->createMock(IInitialStateService::class);
$this->initialState = $this->createMock(IInitialState::class);
$this->boardService = $this->createMock(BoardService::class);
$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
$this->cardMapper = $this->createMock(CardMapper::class);
$this->urlGenerator = $this->createMock(IURLGenerator::class);
Expand All @@ -73,6 +76,7 @@ public function setUp(): void {
$this->request,
$this->permissionService,
$this->initialState,
$this->boardService,
$this->configService,
$this->eventDispatcher,
$this->cardMapper,
Expand Down

0 comments on commit 2ce1c4b

Please sign in to comment.