Merge pull request 'develop' (#477) from develop into master

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

appinfo/info.xml

@@ -30,7 +30,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>6.2.0</version>
+    <version>5.2.1</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.fr/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -52,8 +52,8 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
     <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png]]></screenshot>
     <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png]]></screenshot>
     <dependencies>
-        <php min-version="8.1" max-version="8.5" />
-        <nextcloud min-version="34" max-version="35"/>
+        <php min-version="8.1" max-version="8.4" />
+        <nextcloud min-version="31" max-version="33"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

lib/AppInfo/Application.php

@@ -6,7 +6,6 @@ use OC\AllConfig;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
 use OC\AppFramework\Http\Request;
 use OC\Security\CSP\ContentSecurityPolicyNonceManager;
-use OC\Security\CSRF\CsrfTokenManager;
 use OC\User\User;
 use OCA\SideMenu\Service\AppRepository;
 use OCA\SideMenu\Service\CategoryRepository;
@@ -20,11 +19,8 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
 use OCP\INavigationManager;
-use OCP\IRequest;
-use OCP\IURLGenerator;
 use OCP\IUserSession;
 use OCP\L10N\IFactory;
-use OCP\Server;
 use OCP\Util;
 use Psr\Container\ContainerInterface;
 
@@ -38,9 +34,9 @@ class Application extends App implements IBootstrap
     public const APP_ID = 'side_menu';
     public const APP_NAME = 'Custom menu';
 
-    protected IConfig $config;
+    protected AllConfig $config;
     protected ContentSecurityPolicyNonceManager $cspnm;
-    protected IRequest $request;
+    protected Request $request;
     protected ?User $user = null;
 
     public function __construct(array $urlParams = [])
@@ -87,9 +83,10 @@ class Application extends App implements IBootstrap
 
     public function boot(IBootContext $context): void
     {
-        $this->config = Server::get(IConfig::class);
-        $this->user = Server::get(IUserSession::class)->getUser();
-        $this->request = Server::get(IRequest::class);
+        $this->config = \OC::$server->getConfig();
+        $this->cspnm = \OC::$server->getContentSecurityPolicyNonceManager();
+        $this->user = \OC::$server[IUserSession::class]->getUser();
+        $this->request = \OC::$server->getRequest();
 
         if (!$this->isEnabled()) {
             return;
@@ -141,7 +138,7 @@ class Application extends App implements IBootstrap
         $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
 
         foreach ($assets as $value) {
-            $route = Server::get(IURLGenerator::class)->linkToRoute(
+            $route = \OC::$server->getURLGenerator()->linkToRoute(
                 $value['route'],
                 ['v' => $cache]
             );

lib/Controller/AdminSettingController.php

@@ -97,7 +97,6 @@ class AdminSettingController extends Controller
             'use-avatar',
             'add-logo-link',
             'show-settings',
-            'show-search-form',
             'loader-enabled',
             'always-displayed',
             'enabled',
@@ -138,7 +137,6 @@ class AdminSettingController extends Controller
             'use-avatar' => '0',
             'add-logo-link' => '1',
             'show-settings' => '0',
-            'show-search-form' => '1',
             'loader-enabled' => '1',
             'always-displayed' => '0',
             'enabled' => '1',
@@ -208,17 +206,7 @@ class AdminSettingController extends Controller
         }
 
         foreach ($defaults as $key => $default) {
-            if (array_key_exists($key, $config)) {
-                continue;
-            }
-
-            if (in_array($key, $booleans)) {
-                $config[$key] = $default === '1';
-            } elseif (in_array($key, $arrays)) {
-                $config[$key] = json_decode($default);
-            } elseif (in_array($key, $integers)) {
-                $config[$key] = (int) $default;
-            } else {
+            if (!array_key_exists($key, $config)) {
                 $config[$key] = $default;
             }
         }

lib/Controller/JsController.php

@@ -135,7 +135,6 @@ class JsController extends Controller
             'force-light-icon' => $this->config->getAppValueBool('force-light-icon', '0'),
             'display-logo' => $this->config->getAppValueBool('display-logo', '1'),
             'use-avatar' => $this->config->getAppValueBool('use-avatar', '0'),
-            'show-search-form' => $this->config->getAppValueBool('show-search-form', '1'),
             'hide-when-no-apps' => $this->config->getAppValueBool('hide-when-no-apps', '0'),
             'loader-enabled' => $this->config->getAppValueBool('loader-enabled', '1'),
             'always-displayed' => $this->config->getAppValueBool('always-displayed', '0'),

package.json

@@ -11,9 +11,8 @@
   },
   "dependencies": {
     "@babel/core": ">=7.12.0 <8.0.0",
-    "@formatjs/intl-segmenter": "^12.0.8",
     "@nextcloud/router": "^3.0.1",
-    "@nextcloud/vue": "^9.9.0",
+    "@nextcloud/vue": "^9.0.0-alpha.8",
     "node-polyfill-webpack-plugin": "^4.1.0",
     "pinia": "^3.0.1",
     "postcss": "^7.0.0 || ^8.0.1",

src/admin.js

@@ -17,8 +17,6 @@
 
 import './scss/admin.scss'
 
-import '@formatjs/intl-segmenter/polyfill.js'
-
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import { waitContainer } from './lib/dom.js'

src/l10n/fixtures/cs.yaml

@@ -109,4 +109,3 @@
 'Customize': 'Přizpůsobit'
 'Custom': 'Custom'
 'Close': 'Zavřít'
-'Show the search form': 'Show the search form'

src/l10n/fixtures/de.yaml

@@ -109,4 +109,3 @@
 'Customize': 'Customize'
 'Custom': 'Custom'
 'Close': 'Close'
-'Show the search form': 'Show the search form'

src/l10n/fixtures/es.yaml

@@ -94,19 +94,18 @@
 'Search': 'Buscar'
 'Toggle the menu': 'Alternar el menú'
 'Open the documentation': 'Open the documentation'
-'Ask the developer': 'Pregúntale al desarrollador'
-'New request': 'Nueva solicitud'
-'Report a bug': 'Informar de un fallo'
-'Show the configuration': 'Mostrar los ajustes'
+'Ask the developer': 'Ask the developer'
+'New request': 'New request'
+'Report a bug': 'Report a bug'
+'Show the configuration': 'Show the configuration'
 'Configuration:': 'Configuration:'
-'Done!': '¡Realizado!'
-'Copy': 'Copiar'
-'Need help': 'Ayudame'
-'I would like a new feature': 'Me gustaría una nueva función'
-'Something went wrong': 'Algo salió mal'
-'Select apps': 'Selecciona las aplicaciones'
-'Sort': 'Ordenar'
-'Customize': 'Personalizar'
+'Done!': 'Done!'
+'Copy': 'Copy'
+'Need help': 'Need help'
+'I would like a new feature': 'I would like a new feature'
+'Something went wrong': 'Something went wrong'
+'Select apps': 'Select apps'
+'Sort': 'Sort'
+'Customize': 'Customize'
 'Custom': 'Custom'
-'Close': 'Cerrar'
-'Show the search form': 'Show the search form'
+'Close': 'Close'

src/l10n/fixtures/fr.yaml

@@ -128,4 +128,3 @@
 'Customize': 'Personnaliser'
 'Custom': 'Personnalisé'
 'Close': 'Fermer'
-'Show the search form': 'Afficher le formulaire de recherche'

src/l10n/fixtures/gl.yaml

@@ -109,4 +109,3 @@
 'Customize': 'Personalizar'
 'Custom': 'Personalizado'
 'Close': 'Pechar'
-'Show the search form': 'Show the search form'

src/l10n/fixtures/nl.yaml

@@ -109,4 +109,3 @@
 'Customize': 'Customize'
 'Custom': 'Custom'
 'Close': 'Close'
-'Show the search form': 'Show the search form'

src/l10n/fixtures/pt_BR.yaml

@@ -107,4 +107,3 @@
 'Customize': 'Customize'
 'Custom': 'Custom'
 'Close': 'Close'
-'Show the search form': 'Show the search form'

src/l10n/fixtures/ru.yaml

@@ -109,4 +109,3 @@
 'Customize': 'Приспособить'
 'Custom': 'Custom'
 'Close': 'Закрыть'
-'Show the search form': 'Show the search form'

src/l10n/fixtures/sk.yaml

@@ -107,4 +107,3 @@
 'Customize': 'Customize'
 'Custom': 'Custom'
 'Close': 'Close'
-'Show the search form': 'Show the search form'

src/l10n/fixtures/sv.yaml

@@ -109,4 +109,3 @@
 'Customize': 'Anpassa'
 'Custom': 'Anpassad'
 'Close': 'Stäng'
-'Show the search form': 'Show the search form'

src/l10n/fixtures/tpl/base.yaml

@@ -109,4 +109,3 @@
 'Customize': 'Customize'
 'Custom': 'Custom'
 'Close': 'Close'
-'Show the search form': 'Show the search form'

src/l10n/fixtures/zh_CN.yaml

@@ -38,7 +38,7 @@
 'Show only the opener (hidden logo)': '仅显示触发器（隐藏徽标）'
 'Do not display the side menu and the opener if there is no application (eg: public pages).': '如果没有应用程序（例如：公共页面），则不要显示侧边栏菜单和触发器。'
 'Panel': '面板'
-'Open the menu when the mouse is hover the opener (automatically disabled on touch screens)': '当鼠标悬停在触发器上时打开菜单（在触摸屏上自动禁用）'
+'Open the menu when the mouse is hover the opener (automatically disabled on touch screens)': '‌当鼠标悬停在触发器上时打开菜单（在触摸屏上自动禁用）'
 'Display the big menu': '显示大型菜单'
 'Display the logo': '显示徽标'
 'Icons and texts': '图标和文本'
@@ -109,4 +109,3 @@
 'Customize': '自定义'
 'Custom': '自定义'
 'Close': '关闭'
-'Show the search form': 'Show the search form'

src/menu.js

@@ -17,8 +17,6 @@
 
 import './scss/menu.scss'
 
-import '@formatjs/intl-segmenter/polyfill.js'
-
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import { createElement, waitContainer } from './lib/dom.js'

src/menus/SideMenuWithCategories.vue

@@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         :label="settings.name"
         :avatar="settings.avatar"
       />
-      <AppSearch v-if="showSearchForm" v-model="search" />
+      <AppSearch v-model="search" />
       <OpenerButton
         v-if="!openerHover"
         @click="$emit('close')"
@@ -102,7 +102,6 @@ const activeApp = ref(null)
 const targetBlankApps = ref([])
 const settings = ref(null)
 const search = ref('')
-const showSearchForm = ref(true)
 const openerHover = ref(false)
 const menu = useTemplateRef('menu')
 const isTouchDevice = window.matchMedia('(pointer: coarse)').matches
@@ -121,7 +120,6 @@ onMounted(async () => {
 
   targetBlankApps.value = config['target-blank-apps']
   settings.value = config['settings']
-  showSearchForm.value = config['show-search-form']
   openerHover.value = config['opener-hover'] && !isTouchDevice
 
   items.value = await navStore.getCategories()

src/menus/SimpleSideMenu.vue

@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         :avatar="settings.avatar"
       />
       <AppSearch
-        v-if="showSearchForm && open"
+        v-if="open"
         v-model="search"
       />
       <OpenerButton
@@ -103,7 +103,6 @@ const openerHover = ref(false)
 const alwaysDisplayed = ref(false)
 const displayLogo = ref(false)
 const useAvatarAsLogo = ref(false)
-const showSearchForm = ref(true)
 const search = ref('')
 const apps = ref([])
 const menu = useTemplateRef('menu')
@@ -152,7 +151,6 @@ onMounted(async () => {
   alwaysDisplayed.value = config['always-displayed']
   targetBlankApps.value = config['target-blank-apps']
   forceLightIcon.value = config['force-light-icon']
-  showSearchForm.value = config['show-search-form']
 
   avatar.value = config['avatar']
   logo.value = config['logo']

src/menus/StandardMenu.vue

@@ -62,9 +62,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       </li>
     </ul>
     <NcActions
-      class="cm-standardmenu-app-menu-more"
+      class="cm-standardmenu-app-menu-more app-menu-more"
       :aria-label="t('core', 'More apps')"
-      :forceMenu="true"
     >
       <NcActionLink
         v-for="app in popoverAppList"
@@ -133,27 +132,19 @@ const setApps = (value) => {
 const appLimit = () => {
   const headerStart = document.querySelector('#header .header-start')
   const headerEnd = document.querySelector('#header .header-end')
-  const unifiedSearch = document.querySelector('#header .unified-search-input')
   const body = document.querySelector('body')
 
-  let totalWidth = body.offsetWidth
-  let otherElementsWidth = headerEnd ? headerEnd.offsetWidth : 0
-
-  if (unifiedSearch && headerEnd.offsetWidth < unifiedSearch.offsetWidth) {
-    otherElementsWidth += unifiedSearch.offsetWidth
-  }
-
-  let maxWidth = body.offsetWidth - otherElementsWidth
+  let size = (headerEnd ? headerEnd.offsetWidth : 0) + 70
 
   if (headerStart) {
     Array.from(headerStart.children).forEach((child) => {
       if (child.id !== 'app-menu-container') {
-        maxWidth -= child.offsetWidth
+        size += child.offsetWidth
       }
     })
   }
 
-  return Math.max(0, Math.floor(maxWidth / 60) - 1)
+  return Math.max(0, Math.floor((body.offsetWidth - size) / 70))
 }
 
 const makeStyle = (app) => {
@@ -165,9 +156,13 @@ const makeStyle = (app) => {
 }
 
 const computeLists = () => {
-  const limit = appLimit()
-  mainAppList.value = appList.value.slice(0, limit)
-  popoverAppList.value = appList.value.slice(limit).sort((a, b) => a.order - b.order)
+  mainAppList.value = appList.value.slice(0, appLimit())
+  popoverAppList.value = appList.value.slice(appLimit()).sort((a, b) => a.order - b.order)
+}
+
+const reComputeLists = (delay) => {
+    window.clearTimeout(resizeTimeout)
+    resizeTimeout = window.setTimeout(computeLists, delay || 100)
 }
 
 onMounted(async () => {
@@ -182,7 +177,7 @@ onMounted(async () => {
 
   setApps(await navStore.getCoreApps())
 
-  window.setInterval(computeLists, 100)
+  window.addEventListener('resize', reComputeLists)
 })
 </script>
 

src/menus/TopWideMenu.vue

@@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         :label="settings.name"
         :avatar="settings.avatar"
       />
-      <AppSearch v-if="showSearchForm" v-model="search" />
+      <AppSearch v-model="search" />
       <OpenerButton
         v-if="!openerHover"
         @click="$emit('close')"
@@ -107,7 +107,6 @@ const activeApp = ref(null)
 const targetBlankApps = ref([])
 const settings = ref(null)
 const search = ref('')
-const showSearchForm = ref(true)
 const openerHover = ref(false)
 const menu = useTemplateRef('menu')
 const isTouchDevice = window.matchMedia('(pointer: coarse)').matches
@@ -126,7 +125,6 @@ onMounted(async () => {
 
   targetBlankApps.value = config['target-blank-apps']
   settings.value = config['settings']
-  showSearchForm.value = config['show-search-form']
   openerHover.value = config['opener-hover'] && !isTouchDevice
 
   items.value = await navStore.getCategories()

src/pages/AdminSettings.vue

@@ -29,8 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       />
     </NcAppNavigation>
     <NcAppContent class="cm-settings cm-settings--nav">
-      <button @click="toggleNav" class="cm-settings-nav-toggle">{{ trans('Toggle menu') }}</button>
-
       <SettingsSection :hidden="section !== 'panel'">
         <SectionTitle label="Panel" />
 
@@ -82,15 +80,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
             <FormYesNo v-model="config['show-settings']" />
           </SettingValue>
         </SettingItem>
-        <SettingItem :disabled="config['always-displayed']">
-          <SettingLabel
-            label="Show the search form"
-            :middle="true"
-          />
-          <SettingValue>
-            <FormYesNo v-model="config['show-search-form']" />
-          </SettingValue>
-        </SettingItem>
         <SettingItem>
           <SettingLabel
             label="Icons"
@@ -630,10 +619,6 @@ const filterConfig = (value) => {
   return result
 }
 
-const toggleNav = () => {
-  document.querySelector('.cm-settings-nav .app-navigation-toggle-wrapper > button').click()
-}
-
 onMounted(async () => {
   config.value = await configStore.getAppConfig()
 

src/scss/admin.scss

@@ -15,25 +15,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-.cm-settings-nav {
-    padding-top: 30px !important;
-}
-
-.cm-settings-nav-toggle {
-  margin-top: 40px !important;
-  margin-left: 15px !important;
-}
-
-.cm-settings-nav .app-navigation-toggle-wrapper > button {
-  display: none;
-}
-
 .cm-settings {
-  &-nav {
-    max-width: 50vw !important;
+  &--nav {
+    padding-top: 30px;
+  }
 
+  &-nav {
     .app-navigation__content {
-      padding: 20px 10px 20px 10px;
+      padding: 20px;
     }
 
     .app-navigation-entry-icon {

src/scss/menu.scss

@@ -287,6 +287,14 @@
   }
 }
 
+.cm-standardmenu {
+  visibility: hidden;
+
+  &.show {
+    visibility: visible;
+  }
+}
+
 .cm-always-displayed {
   body {
     width: calc(100% - 50px) !important;
@@ -355,16 +363,6 @@
     right: 0 !important;
     margin-left: 0 !important;
   }
-
-  #content {
-    left: 53px;
-    width: calc(100% - (var(--body-container-margin) * 2) - 62px);
-  }
-
-  #content-vue {
-    width: calc(100% - (var(--body-container-margin) * 2) - 60px);
-    margin-left: 11px;
-  }
 }
 
 @media screen and (max-width: 1024px) {
@@ -387,16 +385,6 @@
       padding: 10px 0;
     }
   }
-
-  #header {
-    .unified-search-input {
-      width: 80px !important;
-
-      .unified-search-input__label {
-        display: none;
-      }
-    }
-  }
 }
 
 @media screen and (min-width: 1024px) {
@@ -418,25 +406,11 @@
 $header-icon-size: 20px;
 
 .cm-standardmenu {
-  visibility: hidden;
   width: 100%;
   display: flex;
   flex-shrink: 1;
   flex-wrap: wrap;
 
-  &.show {
-    visibility: visible;
-  }
-
-  svg {
-    color: var(--color-background-plain-text) !important;
-  }
-
-  .app-menu-entry--label {
-    color: var(--color-background-plain-text) !important;
-    filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright)) !important;
-  }
-
   .app-menu-main {
     display: flex;
     flex-wrap: nowrap;
@@ -496,7 +470,7 @@ $header-icon-size: 20px;
         color: var(--color-primary-text);
         text-align: center;
         left: 50%;
-        top: 55%;
+        top: 45%;
         display: block;
         min-width: 100%;
         transform: translateX(-50%);
@@ -568,28 +542,24 @@ $header-icon-size: 20px;
     }
   }
 
-  &-app-menu-more {
-    padding-top: 9px !important;
+  .app-menu-more .button-vue--vue-tertiary {
+    opacity: 0.7;
+    margin: 8px 3px 3px 3px;
+    filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
 
-    .button-vue--vue-tertiary {
-      opacity: 0.7;
-      margin: 8px 3px 3px 3px;
-      filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
+    &:not([aria-expanded='true']) {
+      color: var(--color-main-text);
 
-      &:not([aria-expanded='true']) {
-        color: var(--color-main-text);
-
-        &:hover {
-          opacity: 1;
-          background-color: transparent !important;
-        }
-      }
-
-      &:focus-visible {
+      &:hover {
         opacity: 1;
-        outline: none !important;
+        background-color: transparent !important;
       }
     }
+
+    &:focus-visible {
+      opacity: 1;
+      outline: none !important;
+    }
   }
 
   &-app-menu-popover-entry {
@@ -629,9 +599,3 @@ $header-icon-size: 20px;
     display: none;
   }
 }
-
-#header {
-  .unified-search-input:not(.unified-search-input--mobile) {
-    position: unset !important;
-  }
-}

src/user.js

@@ -17,8 +17,6 @@
 
 import './scss/admin.scss'
 
-import '@formatjs/intl-segmenter/polyfill.js'
-
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import { waitContainer } from './lib/dom.js'

templates/css/stylesheet.php

@@ -117,3 +117,15 @@ body[data-theme-light], body[data-theme-light-highcontrast] {
     font-size: 16px;
   }
 <?php } ?>
+
+<?php if ($_['always-displayed']) { ?>
+  #content {
+    left: 53px;
+    width: calc(100% - (var(--body-container-margin) * 2) - 62px);
+  }
+
+  #content-vue {
+    width: calc(100% - (var(--body-container-margin) * 2) - 60px);
+    margin-left: 11px;
+  }
+<?php } ?>

webpack.config.js

@@ -7,7 +7,6 @@ const NodePolyfillPlugin = require('node-polyfill-webpack-plugin')
 const TerserPlugin = require('terser-webpack-plugin')
 
 const appName = 'side_menu'
-const appVersion = '6.x'
 const buildMode = process.env.NODE_ENV
 const isDev = buildMode === 'development'
 
@@ -81,7 +80,6 @@ module.exports = {
 
     new webpack.DefinePlugin({
       appName: JSON.stringify(appName),
-      appVersion: JSON.stringify(appVersion),
     }),
   ],