From 9d9afff08d0b00c7946470d1d3fcbc19d8d81f08 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 12 Aug 2020 14:06:52 +0200
Subject: [PATCH] fix compatibility with the option 'hide-when-no-apps'

---
 lib/Controller/NavController.php  |  9 +++++++++
 src/SideMenuBig.vue               | 10 +++++++++-
 templates/settings/admin-form.php |  2 --
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/Controller/NavController.php b/lib/Controller/NavController.php
index 818b700..1d30ec9 100644
--- a/lib/Controller/NavController.php
+++ b/lib/Controller/NavController.php
@@ -27,6 +27,8 @@ use OCP\IL10N;
 use OCP\IRequest;
 use OCP\L10N\IFactory;
 use OC\URLGenerator;
+use OC;
+use OCP\IUserSession;
 
 class NavController extends Controller
 {
@@ -96,10 +98,17 @@ class NavController extends Controller
         $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
         $categoriesLabels = $this->categoryFetcher->get();
         $externalSitesInTopMenu = (bool) $this->config->getAppValue('side_menu', 'external-sites-in-top-menu', 0);
+        $user = OC::$server[IUserSession::class]->getUser();
         $appsCategories = [];
         $categoriesAppsCount = [];
         $items = [];
 
+        if (!$user) {
+            return new JSONResponse([
+                'items' => $items,
+            ]);
+        }
+
         foreach ($categoriesLabels as $k => $category) {
             $categoriesLabels[$category['id']] = $category['translations'][$currentLanguage]['name'] ?? $category['translations']['en']['name'];
 
diff --git a/src/SideMenuBig.vue b/src/SideMenuBig.vue
index 67ba1f4..67b4787 100644
--- a/src/SideMenuBig.vue
+++ b/src/SideMenuBig.vue
@@ -61,7 +61,15 @@ export default {
                 .then(function(response) {
                     that.items = response.data.items
 
-                    jQuery('body').trigger('side-menu.apps', [])
+					let apps = []
+
+					for (let category of that.items) {
+						for (let app of category.apps) {
+							apps.push(app)
+						}
+					}
+
+                    jQuery('body').trigger('side-menu.apps', [apps])
                 });
         },
         retrieveActiveApp() {
diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php
index 9b2ad26..764db04 100644
--- a/templates/settings/admin-form.php
+++ b/templates/settings/admin-form.php
@@ -197,8 +197,6 @@ $choicesSizes = [
             </label>
         </div>
 
-        <p><em>If the <code>big menu</code> is enabled then the menu will be hidden in public pages.</em></p>
-
         <div>
             <select id="side-menu-hide-when-no-apps" name="hide-when-no-apps" class="side-menu-setting">
                 <?php foreach ($choicesYesNo as $label => $value): ?>