From 6be15c269bca4d1b79fb0a33e7d387b8ee12644a Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sun, 27 Oct 2024 18:56:34 +0100
Subject: [PATCH 1/7] remove useless command in ci

---
 .woodpecker/.build.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index f0d0e0e..38526c5 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -7,17 +7,9 @@ when:
   branch: [master, develop, feature/*, fix/*, bugfix/*, translations]
 
 steps:
-  # "Install dependencies":
-  #   image: node:20
-  #   pull: true
-  #   commands:
-  #     - npm i
-
   "Build JS":
     image: node:20
     commands:
-      - make dep
-      - ls -l node_modules/@nextcloud/vue/dist/Components
       - make build
 
   "Build translations":

From 84efcbd36cb60de1760ec83a736a20c997f70bcb Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 30 Oct 2024 18:18:01 +0100
Subject: [PATCH 2/7] fix the menu is displayed even if there are no apps (fix
 #369)

---
 src/SideMenu.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/SideMenu.vue b/src/SideMenu.vue
index 20c7163..14f3cd9 100644
--- a/src/SideMenu.vue
+++ b/src/SideMenu.vue
@@ -39,7 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     <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) && searchMatch(app.name)"
+        v-if="searchMatch(app.name)"
         v-bind:classes="{'side-menu-app': true, 'active': app.active}"
         v-bind:key="key"
         v-bind:icon="app.icon"
@@ -94,17 +94,16 @@ export default {
         orders[app] = order + 1
       })
 
-      for (let id in ncApps) {
-        if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) {
+      for (let app of ncApps) {
+        if (window.topMenuApps.includes(app.id) && !window.topSideMenuApps.includes(app.id)) {
           continue
         }
 
-        if (this.hiddenApps.includes(id)) {
+        if (this.hiddenApps.includes(app.id)) {
           continue
         }
 
-        let app = ncApps[id]
-        app.order = orders[id] || null
+        app.order = orders[app.id] || null
 
         finalApps.push(app)
       }
@@ -117,7 +116,9 @@ export default {
         return a.order < b.order ? -1 : 1
       })
 
+      console.log("aaaaaaaaaaaa")
       this.apps = finalApps
+      console.log(this.apps)
 
       document.querySelector('body').dispatchEvent(new CustomEvent('side-menu.apps', {
         detail: {apps: this.apps},

From c517adcb81d1718409faeb4058207d8dabc4e1c7 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 30 Oct 2024 18:19:01 +0100
Subject: [PATCH 3/7] remove logs

---
 src/SideMenu.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/SideMenu.vue b/src/SideMenu.vue
index 14f3cd9..18ae8ff 100644
--- a/src/SideMenu.vue
+++ b/src/SideMenu.vue
@@ -116,10 +116,6 @@ export default {
         return a.order < b.order ? -1 : 1
       })
 
-      console.log("aaaaaaaaaaaa")
-      this.apps = finalApps
-      console.log(this.apps)
-
       document.querySelector('body').dispatchEvent(new CustomEvent('side-menu.apps', {
         detail: {apps: this.apps},
       }))

From 66a2843a14bd418684b9d71173e8e9c0c8b641ef Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 30 Oct 2024 18:19:13 +0100
Subject: [PATCH 4/7] remove logs

---
 src/SideMenu.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/SideMenu.vue b/src/SideMenu.vue
index 18ae8ff..2e8bfa3 100644
--- a/src/SideMenu.vue
+++ b/src/SideMenu.vue
@@ -116,6 +116,8 @@ export default {
         return a.order < b.order ? -1 : 1
       })
 
+      this.apps = finalApps
+
       document.querySelector('body').dispatchEvent(new CustomEvent('side-menu.apps', {
         detail: {apps: this.apps},
       }))

From 879f9f092b587fac7f6b62138b8867502fda62f1 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 30 Oct 2024 18:33:16 +0100
Subject: [PATCH 5/7] fix op menu labels (fix #368)

---
 src/AppMenu.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/AppMenu.vue b/src/AppMenu.vue
index f75bac1..9558eb5 100644
--- a/src/AppMenu.vue
+++ b/src/AppMenu.vue
@@ -110,14 +110,16 @@ export default defineComponent({
   mounted() {
     axios.get(generateOcsUrl('core/navigation', 2) + '/apps?format=json')
       .then((response) => response.data)
-	  .then((data) => {
+      .then((data) => {
         if (data.ocs.meta.statuscode !== 200) {
           return
         }
 
         this.setApps(data.ocs.data)
-	  })
+      })
 
+    this.targetBlankApps = window.targetBlankApps
+    this.hiddenLabels = window.topMenuAppsMouseOverHiddenLabel
     let timeout = null
 
     window.addEventListener('resize', () => {

From 0402e00eac7fe66828a391967f3785312ce42cea Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 30 Oct 2024 19:07:31 +0100
Subject: [PATCH 6/7] update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5b79e0..80fe366 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## 4.0.1
+### Fixed
+* fix top menu labels (fix #368)
+* fix #369: The menu is displayed even if there are no apps
+
 ## 4.0.0
 ### Added
 * add compatibility with NC30

From 37b9beb8f7f648116fcd774164dc86d70e8087eb Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 30 Oct 2024 19:07:47 +0100
Subject: [PATCH 7/7] update app version

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 9acc9f2..cf4cfbf 100644
--- a/appinfo/info.xml
+++ b/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>4.0.0</version>
+    <version>4.0.1</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>