Merge pull request 'release v3.10.3' (#276) from develop into master

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/276

CHANGELOG.md

@@ -1,5 +1,34 @@
 ## [Unreleased]
 
+## 3.10.3
+### Fixed
+* change the way to load nextcloud components (NcActionLink/NcActions) - fix #274
+* update @nexcloud/* packages
+
+## 3.10.2
+### Fixed
+* add missing properties
+
+## 3.10.1
+### Fixed
+* fix #269: use php7 syntax
+
+## 3.10.0
+### Added
+* add compatibility with NC28
+### Fixed
+* fix NC28 error: remove deprecated method `OC_App::getNavigation()`
+
+## 3.9.1
+### Fixed
+* fix fixed menu on dashboard (#262)
+
+## 3.9.0
+### Added
+* add compatibility with NC27
+### Fixed
+* fix app redirect (#261)
+
 ## 3.8.0
 ### Added
 * add option to show hovered label only on top menu (fix #253)

appinfo/info.xml

@@ -32,7 +32,7 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>3.8.0</version>
+    <version>3.10.3</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -54,7 +54,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png</screenshot>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png</screenshot>
     <dependencies>
-        <nextcloud min-version="25" max-version="26"/>
+        <nextcloud min-version="25" max-version="28"/>
         <php min-version="7.4"/>
     </dependencies>
     <settings>

css/sideMenu.css

@@ -239,14 +239,23 @@
   left: 50px;
 }
 
+.side-menu-always-displayed #header {
+  position: absolute !important;
+}
+
 .side-menu-always-displayed #side-menu {
   display: block;
 }
 
 .side-menu-always-displayed .side-menu-apps-list {
+  height: 100vh;
+  top: 0;
+  overflow: hidden;
+}
+
+.side-menu-always-displayed .side-menu-apps-list--with-settings {
   height: calc(100vh - 49px);
   top: 49px;
-  overflow: hidden;
 }
 
 .side-menu-always-displayed .side-menu-apps-list:hover {

lib/Controller/AppController.php

@@ -74,7 +74,7 @@ class AppController extends Controller
             $inTopMenuApps = in_array($app['id'], $topMenuApps);
             $inHiddenApps = in_array($app['id'], $hiddenApps);
 
-            if (!$inTopMenuApps || $inHiddenApps) {
+            if (!$inTopMenuApps && $inHiddenApps) {
                 continue;
             }
 

lib/Service/AppRepository.php

@@ -3,6 +3,7 @@
 namespace OCA\SideMenu\Service;
 
 use OC\User\User;
+use OCP\INavigationManager;
 use OCP\L10N\IFactory;
 
 /**
@@ -32,8 +33,14 @@ class AppRepository
      */
     protected $categoryRepository;
 
+    /**
+     * @var INavigationManager
+     */
+    protected $navigationManager;
+
     public function __construct(
         \OC_App $ocApp,
+        INavigationManager $navigationManager,
         IFactory $l10nFactory,
         ConfigProxy $config,
         CategoryRepository $categoryRepository
@@ -41,6 +48,7 @@ class AppRepository
         $this->ocApp = $ocApp;
         $this->l10nFactory = $l10nFactory;
         $this->config = $config;
+        $this->navigationManager = $navigationManager;
         $this->categoryRepository = $categoryRepository;
     }
 
@@ -51,7 +59,7 @@ class AppRepository
      */
     public function getVisibleApps()
     {
-        $navigation = $this->ocApp->getNavigation();
+        $navigation = $this->navigationManager->getAll();
         $appCategoriesCustom = $this->config->getAppValueArray('apps-categories-custom', '[]');
         $categories = $this->categoryRepository->getOrderedCategories();
         $apps = $this->ocApp->listAllApps();

package.json

@@ -25,12 +25,12 @@
 		"@babel/core": "^7.9.0",
 		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
 		"@babel/preset-env": "^7.9.0",
-		"@nextcloud/axios": "^1.8.0",
-		"@nextcloud/browserslist-config": "^1.0.0",
+		"@nextcloud/axios": "^2.3.0",
+		"@nextcloud/browserslist-config": "^2.3.0",
 		"@nextcloud/eslint-config": "^8.1.2",
 		"@nextcloud/initial-state": "^2.0.0",
-		"@nextcloud/l10n": "^1.6.0",
-		"@nextcloud/vue": "^7.0.0",
+		"@nextcloud/l10n": "^2.1.0",
+		"@nextcloud/vue": "^7.12.1",
 		"babel-eslint": "^10.1.0",
 		"babel-loader": "^8.1.0",
 		"css-loader": "^3.4.2",

src/AppMenu.vue

@@ -69,7 +69,8 @@
 
 <script>
 import { loadState } from '@nextcloud/initial-state'
-import { NcActions, NcActionLink } from '@nextcloud/vue'
+import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
 
 export default {
   name: 'AppMenu',

src/SideMenu.vue

@@ -16,7 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 -->
 <template>
   <div id="side-menu">
-    <div class="side-menu-header">
+    <div class="side-menu-header" v-if="settings || !openerHover || (!avatar && !alwaysDisplayed && logo) || avatar">
       <SettingsButton
         v-if="settings"
         v-bind:href="settings.href"
@@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       <OpenerButton />
 
       <Logo
-        v-if="!avatar && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
+        v-if="!avatar && !alwaysDisplayed && logo" v-bind:classes="{'side-menu-logo': true, 'avatardiv': false}"
         v-bind:image="logo"
         v-bind:link="logoLink"
       />
@@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       />
     </div>
 
-    <ul class="side-menu-apps-list">
+    <ul class="side-menu-apps-list" :class="{'side-menu-apps-list--with-settings': !!settings}">
       <SideMenuApp
         v-for="(app, key) in apps"
         v-if="!hiddenApps.includes(app.id)"
@@ -79,6 +79,8 @@ export default {
       targetBlankApps: [],
       hiddenApps: [],
       settings: null,
+      openerHover: false,
+      alwaysDisplayed: false,
     }
   },
   methods: {
@@ -136,6 +138,8 @@ export default {
         this.logo = config['logo']
         this.logoLink = config['logo-link']
         this.settings = config['settings']
+        this.openerHover = config['opener-hover']
+        this.alwaysDisplayed = config['always-displayed']
         this.hiddenApps = config['big-menu-hidden-apps']
         this.retrieveApps()
       })