From 30a3f3a9009a5df4b3fff859ed9e4205abe1f593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 23 Jun 2020 15:38:07 +0200 Subject: [PATCH] Initialize panels early to make sure that scripts can be loaded MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .../lib/Controller/DashboardController.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/apps/dashboard/lib/Controller/DashboardController.php b/apps/dashboard/lib/Controller/DashboardController.php index 97d67be146394..3850095bbbd7c 100644 --- a/apps/dashboard/lib/Controller/DashboardController.php +++ b/apps/dashboard/lib/Controller/DashboardController.php @@ -65,17 +65,16 @@ public function index(): TemplateResponse { $dashboardManager = $this->dashboardManager; $userLayout = explode(',', $this->config->getUserValue($this->userId, 'dashboard', 'layout', 'calendar,recommendations,talk,mail')); + $panels = array_map(function (IPanel $panel) { + return [ + 'id' => $panel->getId(), + 'title' => $panel->getTitle(), + 'iconClass' => $panel->getIconClass(), + 'url' => $panel->getUrl() + ]; + }, $dashboardManager->getPanels()); $this->inititalStateService->provideInitialState('dashboard', 'layout', $userLayout); - $this->inititalStateService->provideLazyInitialState('dashboard', 'panels', function () use ($dashboardManager) { - return array_map(function (IPanel $panel) { - return [ - 'id' => $panel->getId(), - 'title' => $panel->getTitle(), - 'iconClass' => $panel->getIconClass(), - 'url' => $panel->getUrl() - ]; - }, $dashboardManager->getPanels()); - }); + $this->inititalStateService->provideInitialState('dashboard', 'panels', $panels); if (class_exists(LoadViewer::class)) { $this->eventDispatcher->dispatchTyped(new LoadViewer());