From a1fade04894bd89883a3184289962eb12c001906 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 25 Sep 2024 12:25:19 +0200
Subject: [PATCH] fixes the recursive function to find a child content_id

---
 public/js/components/Cis/Menu.js       |  5 ++--
 public/js/components/Cis/Menu/Entry.js | 38 ++++++++++++++------------
 2 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index b5f265e3b..2bc8804c0 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -29,12 +29,11 @@ export default {
     created() {
         axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/CisVue/Menu').then(res => {
             this.entries = res.data.retval.childs;
-        });
-		
+		});
     },
     template: /*html*/`
 	<p>CISVUE HEADER</p>
-    <button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
+	<button id="nav-main-btn" class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#nav-main" aria-controls="nav-main" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
     <a id="nav-logo" :href="rootUrl">
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 76bb2a916..43049995f 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -20,16 +20,16 @@ export default {
 			if(newValue == this.entry.content_id){
 				this.entry.menu_open = true;
 			}else{
-				if(this.entry.childs instanceof Array){
-					for(let child of this.entry.childs){
-						child.menu_open = false;
-						
-					}
-				}
-				if (this.searchRecursiveChild(this.entry,newValue)){
+				if (this.searchRecursiveChild(this.entry, newValue)) {
 					this.entry.menu_open = true;
-				}else{
+				} else {
 					this.entry.menu_open = false;
+					if (this.entry.childs instanceof Array) {
+						for (let child of this.entry.childs) {
+							child.menu_open = false;
+
+						}
+					}
 				}
 			}
 		},
@@ -103,20 +103,22 @@ export default {
     },
     methods: {
 		searchRecursiveChild(entry,child_content_id){
-			if (entry.childs instanceof Array) {
-				for (let child of entry.childs) {
-					if (child.content_id == child_content_id){
-						return true;
-					}
+			if (typeof entry.childs == 'object' && !Array.isArray(entry.childs) && Object.entries(entry.childs).length > 0){
+				entry.childs = Object.values(entry.childs);
+			}
+			for (let child of entry.childs) {
+				if (child.content_id == child_content_id) {
+					return true;
+				}
+				if ((child.childs instanceof Array && child.childs.length > 0) || Object.values(child.childs).length > 0) {
 					if (this.searchRecursiveChild(child, child_content_id)){
 						return true;
 					}
 				}
-			}
+			}	
 			return false;
 		},
 		resendEmit(event){
-			console.log(this.entry.titel);
 			this.entry.menu_open = true;
 			this.$emit('activeEntry',event);
 		},
@@ -144,8 +146,10 @@ export default {
 		}
     },
     template: /*html*/`
-	<!--<p>activeContent: {{JSON.stringify(activeContent,null,2)}}</p>
-	<p>entry menu: {{JSON.stringify(entry.menu_open,null,2)}}</p>-->
+	<!-- DEBUGGIING PRINTS
+	<p>entry content_id: {{JSON.stringify(entry.content_id,null,2)}}</p>
+	<p>entry menu: {{JSON.stringify(entry.menu_open,null,2)}}</p>
+	-->
 	<div v-if="entry.template_kurzbz == 'include'">
         INCLUDE
     </div>