From 462857080b444b968e80ab67781634d8c383bb57 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 14 Oct 2024 11:06:48 +0200
Subject: [PATCH] makes the parent menu point active if the child menu points
 gets closed

---
 public/js/components/Cis/Menu.js       | 18 +++++++++++++++--
 public/js/components/Cis/Menu/Entry.js | 28 +++++++++++++-------------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index 9608bc9de..1fd5fce96 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -24,6 +24,11 @@ export default {
 			urlMatchRankings:[],
         };
     },
+	provide(){
+		return{
+			makeParentContentActive: this.makeParentContentActive,
+		}
+	},
 	computed:{
 		highestMatchingUrlCount(){
 			// gets the hightest ranking inside the array
@@ -38,6 +43,15 @@ export default {
 		},
 	},
 	methods:{
+		makeParentContentActive(content_id, collection=this.entries, parent=null){
+			for(let entry of collection){
+				if(entry.content_id == content_id){
+					this.activeEntry = parent;
+				}
+				this.makeParentContentActive(content_id, entry.childs, entry.content_id);
+			}
+			
+		},
 		addUrlCount(count){
 			this.urlMatchRankings.push(count);
 		},
@@ -51,8 +65,8 @@ export default {
 	},
     template: /*html*/`
 	<!--<p>CISVUE HEADER</p>
-	<p>active entry content_id : {{activeEntry}}</p>
 	<p>highest count : {{highestMatchingUrlCount}}</p>
+	<p>active entry content_id : {{activeEntry}}</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">
         <span class="navbar-toggler-icon"></span>
@@ -80,7 +94,7 @@ export default {
 			<div class="offcanvas-body p-0">
 				<div id="nav-main-menu" class="collapse collapse-horizontal show">
 					<div>
-						<cis-menu-entry @UrlCount="addUrlCount" @activeEntry="setActiveEntry" :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
+						<cis-menu-entry @makeParentContentActive="makeParentContentActive" @UrlCount="addUrlCount" @activeEntry="setActiveEntry" :highestMatchingUrlCount="highestMatchingUrlCount" :activeContent="activeEntry" v-for="entry in entries" :key="entry.content_id" :entry="entry" />
 					</div>
 				</div>
 			</div>
diff --git a/public/js/components/Cis/Menu/Entry.js b/public/js/components/Cis/Menu/Entry.js
index 6bbfb962b..b75d71918 100755
--- a/public/js/components/Cis/Menu/Entry.js
+++ b/public/js/components/Cis/Menu/Entry.js
@@ -10,12 +10,13 @@ export default {
 		highestMatchingUrlCount: Number,
     },
     data: () => {
-        return {
-            collapse: null,
+		return {
+			collapse: null,
 			urlCount:0,
         }
     },
 	emits: ["activeEntry", "UrlCount"],
+	inject: ['makeParentContentActive'],
 	watch:{
 		highestMatchingUrlCount: function(newValue)
 		{
@@ -50,6 +51,10 @@ export default {
 			{
 				// only invokes .hide if this.collapse is not null
 				this.collapse && this.collapse.hide();
+				if (this.activeContent == this.entry.content_id)
+				{
+					this.makeParentContentActive(this.entry.content_id);
+				}
 			}
 			// debugging helpers - console.log(this.entry.titel, newValue ? "open" : "close")
 			
@@ -172,19 +177,14 @@ export default {
 			this.$emit('activeEntry',event);
 		},
         toggleCollapse(evt) {
-            if (this.level > 1 && this.collapse !== null) 
+			if (this.active)
 			{
-                this.entry.menu_open = !this.entry.menu_open;
-                this.collapse.toggle(evt.target);
-            }else{
-				if (this.active)
-				{
-					this.$emit("activeEntry", null); 
-				}
-				else
-				{
-					this.$emit("activeEntry", this.entry.content_id);
-				}
+				this.makeParentContentActive(this.entry.content_id); 
+			}
+			else
+			{
+				console.log("entered here to make the content active")
+				this.$emit("activeEntry", this.entry.content_id);
 			}
         }
     },