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

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

CHANGELOG.md

@@ -1,8 +1,17 @@
 ## [Unreleased]
 
-## 5.1.4-rc1
+## 5.2.1
+### Added
+- chore: set side_menu as package name
 ### Fixed
-- fix #464: add Intl.Segmenter polyfill
+- fix(LangRepository): check orm capabilities to query entities
+- fix(admin/\*SaveButton): cast settings to string
+
+## 5.2.0
+### Added
+* add compatibility with NC33
+### Fixed
+* fix #468: force nextcloud logo display css rule (opener-only)
 
 ## 5.1.3
 ### Fixed

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>5.1.4-rc1</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>
@@ -53,7 +53,7 @@ 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_default_menu.png]]></screenshot>
     <dependencies>
         <php min-version="8.1" max-version="8.4" />
-        <nextcloud min-version="31" max-version="32"/>
+        <nextcloud min-version="31" max-version="33"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

lib/Service/LangRepository.php

@@ -30,7 +30,12 @@ class LangRepository
             ->from('preferences')
         ;
 
-        $stmt = $qb->execute();
+        // Nextcloud >=33+
+        if (method_exists($qb, 'executeQuery')) {
+            $stmt = $qb->executeQuery();
+        } else {
+            $stmt = $qb->execute();
+        }
 
         $langs = ['en'];
 

package-lock.json

@@ -7,7 +7,6 @@
       "license": "agpl",
       "dependencies": {
         "@babel/core": ">=7.12.0 <8.0.0",
-        "@formatjs/intl-segmenter": "^12.0.8",
         "@nextcloud/router": "^3.0.1",
         "@nextcloud/vue": "^9.0.0-alpha.8",
         "node-polyfill-webpack-plugin": "^4.1.0",
@@ -533,48 +532,6 @@
       "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==",
       "license": "MIT"
     },
-    "node_modules/@formatjs/ecma402-abstract": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-3.0.8.tgz",
-      "integrity": "sha512-NRiqvxAvhbARZRFSRFPjN0y8txxmVutv2vMYvW2HSdCVf58w9l4osLj6Ujif643vImwZBcbKqhiKE0IOhY+DvA==",
-      "license": "MIT",
-      "dependencies": {
-        "@formatjs/fast-memoize": "3.0.3",
-        "@formatjs/intl-localematcher": "0.7.5",
-        "decimal.js": "^10.4.3",
-        "tslib": "^2.8.0"
-      }
-    },
-    "node_modules/@formatjs/fast-memoize": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-3.0.3.tgz",
-      "integrity": "sha512-CArYtQKGLAOruCMeq5/RxCg6vUXFx3OuKBdTm30Wn/+gCefehmZ8Y2xSMxMrO2iel7hRyE3HKfV56t3vAU6D4Q==",
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.8.0"
-      }
-    },
-    "node_modules/@formatjs/intl-localematcher": {
-      "version": "0.7.5",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.7.5.tgz",
-      "integrity": "sha512-7/nd90cn5CT7SVF71/ybUKAcnvBlr9nZlJJp8O8xIZHXFgYOC4SXExZlSdgHv2l6utjw1byidL06QzChvQMHwA==",
-      "license": "MIT",
-      "dependencies": {
-        "@formatjs/fast-memoize": "3.0.3",
-        "tslib": "^2.8.0"
-      }
-    },
-    "node_modules/@formatjs/intl-segmenter": {
-      "version": "12.0.8",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-segmenter/-/intl-segmenter-12.0.8.tgz",
-      "integrity": "sha512-seByJgn5tx34X25O8mu63wYJ5JVQcUM4fkscobkA+wBhmyI1rJSgNCf6p8XZ28nCm514Cb2N0f3sAmpEyLPJ6g==",
-      "license": "MIT",
-      "dependencies": {
-        "@formatjs/ecma402-abstract": "3.0.8",
-        "@formatjs/intl-localematcher": "0.7.5",
-        "tslib": "^2.8.0"
-      }
-    },
     "node_modules/@humanfs/core": {
       "version": "0.19.1",
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
@@ -2855,12 +2812,6 @@
         }
       }
     },
-    "node_modules/decimal.js": {
-      "version": "10.6.0",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
-      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
-      "license": "MIT"
-    },
     "node_modules/decode-named-character-reference": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.1.0.tgz",
@@ -7416,12 +7367,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD"
-    },
     "node_modules/tty-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",

package.json

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

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/components/settings/AdminSaveButton.vue

@@ -73,10 +73,10 @@ const save = async () => {
         if (Array.isArray(value) || typeof value === 'object') {
           value = JSON.stringify(value)
         } else if (typeof value === 'boolean') {
-          value = value ? 1 : 0
+          value = value ? '1' : '0'
         }
 
-        OCP.AppConfig.setValue('side_menu', key, value, {
+        OCP.AppConfig.setValue('side_menu', key, value.toString(), {
           success() {
             update()
           },

src/components/settings/UserSaveButton.vue

@@ -69,11 +69,11 @@ const save = async () => {
     if (Array.isArray(value) || typeof value === 'object') {
       value = JSON.stringify(value)
     } else if (typeof value === 'boolean') {
-      value = value ? 1 : 0
+      value = value ? '1' : '0'
     }
 
     formData.push('name=' + encodeURIComponent(key))
-    formData.push('value=' + encodeURIComponent(value))
+    formData.push('value=' + encodeURIComponent(value.toString()))
 
     fetch(url, {
       method: 'POST',

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/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

@@ -38,7 +38,7 @@ body[data-theme-light], body[data-theme-light-highcontrast] {
 
 <?php if ($_['opener-only']) { ?>
   #nextcloud {
-    display: none;
+    display: none !important;
   }
 <?php } ?>