Merge pull request 'release v3.10.2' (#272) from develop into master

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

.woodpecker.yml

@@ -6,46 +6,66 @@ pipeline:
       - npm i
     when:
       event: [tag, push, pull_request]
-      branch: [master, develop, feature/*, translations]
+      branch: [master, develop, feature/*, fix/*, translations]
 
-  osv_detector:
+  osv-detector:
     image: gitnet.fr/deblan/osv-detector:v0.10
     commands:
       - osv-detector package-lock.json
     failure: ignore
 
-  build_js:
+  build-js:
     image: node:16
     commands:
       - npm run build
     when:
-      branch: [master, develop, feature/*, translations]
+      branch: [master, develop, feature/*, fix/*, translations]
       event: [tag, push, pull_request]
 
-  build_php:
+  build-translations:
     image: deblan/php:8.0
     commands:
       - php bin/generate_l10n.php
     when:
-      branch: [master, develop, feature/*, translations]
+      branch: [master, develop, feature/*, fix/*, translations]
       event: [tag, push, pull_request]
 
-  code_quality:
+  create-signature:
-    image: sonarsource/sonar-scanner-cli
+    image: nextcloud:25
-    secrets: [sonar_token, sonar_host, sonar_project]
+    secrets: [app_certificate, app_public_certificate]
+    environment:
+      SQLITE_DATABASE: /var/www/data/data.db
+      NEXTCLOUD_ADMIN_USER: admin
+      NEXTCLOUD_ADMIN_PASSWORD: admin
     commands:
-      - sonar-scanner
+      - echo "$APP_CERTIFICATE" > "/tmp/side_menu.key"
-        -Dsonar.projectKey=$SONAR_PROJECT
+      - echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt"
-        -Dsonar.sources=.
+      - mkdir /tmp/app
-        -Dsonar.host.url=$SONAR_HOST
+      - cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor /tmp/app
-        -Dsonar.pullrequest.key=$CI_COMMIT_PULL_REQUEST
+      - /usr/src/nextcloud/occ integrity:sign-app
-        -Dsonar.pullrequest.branch=$CI_COMMIT_SOURCE_BRANCH
+        --privateKey=/tmp/side_menu.key
-        -Dsonar.pullrequest.base=$CI_COMMIT_TARGET_BRANCH
+        --certificate=/tmp/side_menu.crt
-    failure: ignore
+        --path=/tmp/app
+      - mv /tmp/app/appinfo/signature.json appinfo/
     when:
-      event: [pull_request]
+      event: [tag]
 
-  package:
+  # check-code-quality:
+  #   image: sonarsource/sonar-scanner-cli
+  #   secrets: [sonar_token, sonar_host, sonar_project]
+  #   commands:
+  #     - sonar-scanner
+  #       -Dsonar.projectKey=$SONAR_PROJECT
+  #       -Dsonar.sources=.
+  #       -Dsonar.host.url=$SONAR_HOST
+  #       -Dsonar.pullrequest.key=$CI_COMMIT_PULL_REQUEST
+  #       -Dsonar.pullrequest.branch=$CI_COMMIT_SOURCE_BRANCH
+  #       -Dsonar.pullrequest.base=$CI_COMMIT_TARGET_BRANCH
+  #   failure: ignore
+  #   when:
+  #     event: [pull_request]
+
+  create-package:
     image: deblan/php:8.0
     volumes:
       - /var/www/html/artifacts:/var/www/html/artifacts
@@ -61,7 +81,7 @@ pipeline:
     when:
       event: [tag]
 
-  release:
+  push-release:
     image: plugins/gitea-release
     volumes:
       - /var/www/html/artifacts:/var/www/html/artifacts

CHANGELOG.md

@@ -1,5 +1,49 @@
 ## [Unreleased]
 
+## 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)
+
+## 3.7.4
+### Fixed
+* fix Integrity failed (#247)
+
+## 3.7.3
+### Fixed
+* fix #244: use app href for redirection
+### Added
+* add signature on build
+
+## 3.7.2
+### Added
+* update pipeline conditions allowing `fix/*`
+### Fixed
+* fix #233: load configuration and then retrieve apps in default side menu display
+
 ## 3.7.1
 ### Fixed
 * fix build process (#230)

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.7.1</version>
+    <version>3.10.2</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,33 +74,37 @@ class AppController extends Controller
             $inTopMenuApps = in_array($app['id'], $topMenuApps);
             $inHiddenApps = in_array($app['id'], $hiddenApps);
 
-            if (!$inTopMenuApps || $inHiddenApps) {
+            if (!$inTopMenuApps && $inHiddenApps) {
                 continue;
             }
 
-            return $this->redirectToApp($app['id']);
+            return $this->redirectToApp($app, true);
         }
 
         return $this->redirectToApp('files');
     }
 
-    protected function redirectToApp($appId): RedirectResponse
+    protected function redirectToApp($app, bool $isHref = false): RedirectResponse
     {
-        $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue(
+        if (!$isHref) {
-            'htaccess.IgnoreFrontController',
+            $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue(
-            false
+                'htaccess.IgnoreFrontController',
-        );
+                false
+            );
 
-        $isFrontControllerActive = 'true' === getenv('front_controller_active');
+            $isFrontControllerActive = 'true' === getenv('front_controller_active');
 
-        if ($isIgnoreFrontController || $isFrontControllerActive) {
+            if ($isIgnoreFrontController || $isFrontControllerActive) {
-            $path = '/apps/%s/';
+                $path = '/apps/%s/';
+            } else {
+                $path = '/index.php/apps/%s/';
+            }
+
+            $url = $this->urlGenerator->getAbsoluteURL(sprintf($path, $app));
         } else {
-            $path = '/index.php/apps/%s/';
+            $url = $app['href'];
         }
 
-        $url = $this->urlGenerator->getAbsoluteURL(sprintf($path, $appId));
-
         return new RedirectResponse($url);
     }
 }

lib/Controller/JsController.php

@@ -171,7 +171,7 @@ class JsController extends Controller
             'avatar' => $avatar,
             'top-menu-apps' => $topMenuApps,
             'top-side-menu-apps' => $topSideMenuApps,
-            'top-menu-mouse-over-hidden-label' => $this->config->getAppValueBool(
+            'top-menu-mouse-over-hidden-label' => $this->config->getAppValueInt(
                 'top-menu-mouse-over-hidden-label',
                 '0'
             ),

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();

src/AppMenu.vue

@@ -24,14 +24,14 @@
   <nav class="app-menu show">
     <ul
       class="app-menu-main"
-      :class="{ 'app-menu-main__hidden-label': hiddenLabels }"
+      :class="{ 'app-menu-main__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
       v-if="apps !== null"
       >
       <li v-for="app in mainAppList()"
         :key="app.id"
         :data-app-id="app.id"
         class="app-menu-entry"
-        :class="{ 'app-menu-entry__active': app.active, 'app-menu-entry__hidden-label': hiddenLabels }"
+        :class="{ 'app-menu-entry__active': app.active, 'app-menu-entry__hidden-label': hiddenLabels === 1, 'app-menu-main__show-hovered': hiddenLabels === 2 }"
         :style="makeStyle(app)"
         >
         <a :href="app.href"
@@ -233,8 +233,8 @@ $header-icon-size: 20px;
       overflow: hidden;
     }
 
-    &:not(.app-menu-entry__hidden-label):hover,
+    &:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):hover,
-    &:not(.app-menu-entry__hidden-label):focus-within {
+    &:not(.app-menu-entry__hidden-label):not(.app-menu-entry__show-hovered):focus-within {
       opacity: 1;
       .app-menu-entry--label {
         opacity: 1;
@@ -245,7 +245,6 @@ $header-icon-size: 20px;
         overflow: visible;
       }
     }
-
   }
 
   // Show labels
@@ -256,8 +255,8 @@ $header-icon-size: 20px;
     opacity: 1;
   }
 
-  &:not(.app-menu-main__hidden-label):hover,
+  &:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):hover,
-  &:not(.app-menu-main__hidden-label):focus-within,
+  &:not(.app-menu-main__hidden-label):not(.app-menu-main__show-hovered):focus-within,
   .app-menu-entry:not(.app-menu-entry__hidden-label):hover,
   .app-menu-entry:not(.app-menu-entry__hidden-label):focus {
     img {
@@ -273,6 +272,22 @@ $header-icon-size: 20px;
       opacity: 0;
     }
   }
+
+  &.app-menu-main__show-hovered .app-menu-entry:hover,
+  &.app-menu-main__show-hovered .app-menu-entry:focus {
+    img {
+      margin-top: -6px;
+    }
+
+    .app-menu-entry--label {
+      opacity: 1;
+      bottom: 0;
+    }
+
+    &::before, .app-menu-entry::before {
+      opacity: 0;
+    }
+  }
 }
 
 ::v-deep .app-menu-more .button-vue--vue-tertiary {

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: {
@@ -93,7 +95,11 @@ export default {
 
       for (let id in ncApps) {
         if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) {
-          continue;
+          continue
+        }
+
+        if (this.hiddenApps.includes(id)) {
+          continue
         }
 
         let app = ncApps[id]
@@ -104,10 +110,10 @@ export default {
 
       finalApps.sort((a, b) => {
         if (a.order === null || b.order === null) {
-          return a.name < b.name ? -1 : 1;
+          return a.name < b.name ? -1 : 1
         }
 
-        return a.order < b.order ? -1 : 1;
+        return a.order < b.order ? -1 : 1
       })
 
       this.apps = finalApps
@@ -118,24 +124,25 @@ export default {
     },
 
     retrieveConfig() {
-      axios
-        .get(OC.generateUrl('/apps/side_menu/js/config'))
-        .then((response) => {
-          const config = response.data
-
-          this.targetBlankApps = config['target-blank-apps']
-          this.forceLightIcon = config['force-light-icon']
-          this.avatar = config['avatar']
-          this.logo = config['logo']
-          this.logoLink = config['logo-link']
-          this.settings = config['settings']
-          this.hiddenApps = config['big-menu-hidden-apps']
-        })
     },
   },
   mounted() {
-    this.retrieveConfig()
+    axios
-    this.retrieveApps()
+      .get(OC.generateUrl('/apps/side_menu/js/config'))
+      .then((response) => {
+        const config = response.data
+
+        this.targetBlankApps = config['target-blank-apps']
+        this.forceLightIcon = config['force-light-icon']
+        this.avatar = config['avatar']
+        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()
+      })
   }
 }
 </script>

src/l10n/fixtures/cs.yaml

@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Aplikace ponechané v horní nabídce ale také zobrazené v té boční"
 "These applications must be selected in the previous option.": "Tyto aplikace je třeba vybrat v předchozí volbě."
 "Hide labels on mouse over": "Skrýt popisky při najetím ukazatele myši"
+"Except the hovered app": "Except the hovered app"

src/l10n/fixtures/de.yaml

@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
 "These applications must be selected in the previous option.": "These applications must be selected in the previous option."
 "Hide labels on mouse over": "Hide labels on mouse over"
+"Except the hovered app": "Except the hovered app"

src/l10n/fixtures/es.yaml

@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Las aplicaciones se mantienen en el menú superior pero también se muestran en el menú lateral"
 "These applications must be selected in the previous option.": "Estas aplicaciones deben ser seleccionadas en las opciones anteriores."
 "Hide labels on mouse over": "Ocultar las etiquetas al pasar el ratón"
+"Except the hovered app": "Except the hovered app"

src/l10n/fixtures/fr.yaml

@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Applications conservées dans le menu supérieur mais également affichées dans le menu latéral"
 "These applications must be selected in the previous option.": "Ces applications doivent également être sélectionnées dans l'option précédente."
 "Hide labels on mouse over": "Masquer le libellé des applications au passage de la souris"
+"Except the hovered app": "À l'exception de l'application survolée"

src/l10n/fixtures/nl.yaml

@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Applicaties blijven in het topmenu maar worden ook in het zijmenu getoond"
 "These applications must be selected in the previous option.": "Deze toepassingen moeten bij de vorige optie zijn geselecteerd."
 "Hide labels on mouse over": "Hide labels on mouse over"
+"Except the hovered app": "Except the hovered app"

src/l10n/fixtures/ru.yaml

@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
 "These applications must be selected in the previous option.": "These applications must be selected in the previous option."
 "Hide labels on mouse over": "Скрыть название при наведении мыши"
+"Except the hovered app": "Except the hovered app"

src/l10n/fixtures/tpl/base.yaml

@@ -93,3 +93,4 @@
 "Applications kept in the top menu but also shown in side menu": ""
 "These applications must be selected in the previous option.": ""
 "Hide labels on mouse over": ""
+"Except the hovered app": ""

src/l10n/fixtures/zh_CN.yaml

@@ -91,3 +91,4 @@
 "Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
 "These applications must be selected in the previous option.": "These applications must be selected in the previous option."
 "Hide labels on mouse over": "Hide labels on mouse over"
+"Except the hovered app": "Except the hovered app"

templates/settings/admin-form.php

@@ -878,9 +878,15 @@ $labelAlwaysDisplayed = 'Always displayed';
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Hide labels on mouse over')); ?>
                 </div>
+                <?php
+                    $choices = array_merge(
+                        $choicesYesNo,
+                        ['Except the hovered app' => '2']
+                    );
+                ?>
                 <div class="side-menu-setting-form">
                     <select id="side-menu-top-menu-mouse-over-hidden-label" name="top-menu-mouse-over-hidden-label" class="side-menu-setting">
-                        <?php foreach ($choicesYesNo as $label => $value): ?>
+                        <?php foreach ($choices as $label => $value): ?>
                             <option value="<?php echo $value ?>" <?php if ($value === $_['top-menu-mouse-over-hidden-label']): ?>selected<?php endif; ?>>
                                 <?php echo $l->t($label);  ?>
                             </option>