Load sidebar on dashboard

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/apps/dashboard/lib/Controller/DashboardController.php b/apps/dashboard/lib/Controller/DashboardController.php
index 07cfaf071e250b5030df4560cdc0a13c8895d55d..d7f9453cb4e2c7234bbe934e2e6966fc8df56329 100644 (file)
--- a/apps/dashboard/lib/Controller/DashboardController.php
+++ b/apps/dashboard/lib/Controller/DashboardController.php
@@ -27,6 +27,7 @@ declare(strict_types=1);
 namespace OCA\Dashboard\Controller;
 
 use OCA\Dashboard\AppInfo\Application;
+use OCA\Files\Event\LoadSidebar;
 use OCA\Viewer\Event\LoadViewer;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\JSONResponse;
@@ -76,6 +77,11 @@ class DashboardController extends Controller {
         * @return TemplateResponse
         */
        public function index(): TemplateResponse {
+               $this->eventDispatcher->dispatchTyped(new LoadSidebar());
+               if (class_exists(LoadViewer::class)) {
+                       $this->eventDispatcher->dispatchTyped(new LoadViewer());
+               }
+
                $this->eventDispatcher->dispatchTyped(new RegisterWidgetEvent($this->dashboardManager));
 
                $userLayout = explode(',', $this->config->getUserValue($this->userId, 'dashboard', 'layout', 'recommendations,spreed,mail,calendar'));
@@ -92,10 +98,6 @@ class DashboardController extends Controller {
                $this->inititalStateService->provideInitialState('dashboard', 'firstRun', $this->config->getUserValue($this->userId, 'dashboard', 'firstRun', '1') === '1');
                $this->config->setUserValue($this->userId, 'dashboard', 'firstRun', '0');
 
-               if (class_exists(LoadViewer::class)) {
-                       $this->eventDispatcher->dispatchTyped(new LoadViewer());
-               }
-
                return new TemplateResponse('dashboard', 'index');
        }
 

diff --git a/apps/dashboard/src/main.js b/apps/dashboard/src/main.js
index 74d7cb69d4dff9e92d063edad2cd02179d687975..049582e489a770c9cef70db9d0c397e8f168ff23 100644 (file)
--- a/apps/dashboard/src/main.js
+++ b/apps/dashboard/src/main.js
@@ -3,8 +3,11 @@ import App from './App.vue'
 import { translate as t } from '@nextcloud/l10n'
 Vue.prototype.t = t
 
+// FIXME workaround to make the sidebar work
+Object.assign(window.OCA.Files, { App: { fileList: { filesClient: OC.Files.getClient() } } }, window.OCA.Files)
+
 const Dashboard = Vue.extend(App)
-const Instance = new Dashboard({}).$mount('#app')
+const Instance = new Dashboard({}).$mount('#app-content-vue')
 
 window.OCA.Dashboard = {
        register: (app, callback) => Instance.register(app, callback),

diff --git a/apps/dashboard/templates/index.php b/apps/dashboard/templates/index.php
index bca9fa30494682d0dcf6789e8f50aeee96450579..e4056ce06e26903e55d03d26664e251d84eb517a 100644 (file)
--- a/apps/dashboard/templates/index.php
+++ b/apps/dashboard/templates/index.php
@@ -1,4 +1,4 @@
 <?php
        \OCP\Util::addScript('dashboard', 'dashboard');
 ?>
-<div id="app"></div>
+<div id="app-content-vue"></div>