From 8c6f9d1bc436555c4acb616d467199e08b6404bd Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Mon, 30 Sep 2024 11:14:34 +0200
Subject: [PATCH] loads the menu for the CISVUE-Header in the server side
 instead of the client side

---
 application/views/templates/CISHTML-Header.php |  2 +-
 application/views/templates/CISVUE-Header.php  | 11 ++++++++++-
 public/js/components/Cis/Menu.js               | 11 +++++------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/application/views/templates/CISHTML-Header.php b/application/views/templates/CISHTML-Header.php
index 6ef942df0..c3790cc95 100755
--- a/application/views/templates/CISHTML-Header.php
+++ b/application/views/templates/CISHTML-Header.php
@@ -18,7 +18,7 @@ $this->load->view('templates/FHC-Header', $includesArray);
 if (!isset($menu)) {
 	$ci =& get_instance(); // get CI instance
 	$ci->load->model('content/Content_model', 'ContentModel');
-	$result = $ci->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, get_uid());
+	$result = $ci->ContentModel->getMenu(null, get_uid());
 	$menu = getData($result) ?? (object)['childs' => []];
 }
 ?>
diff --git a/application/views/templates/CISVUE-Header.php b/application/views/templates/CISVUE-Header.php
index 686656592..d738dbde9 100755
--- a/application/views/templates/CISVUE-Header.php
+++ b/application/views/templates/CISVUE-Header.php
@@ -15,6 +15,13 @@ $includesArray = array(
 
 $this->load->view('templates/FHC-Header', $includesArray);
 
+
+if (!isset($menu)) {
+	$ci =& get_instance(); // get CI instance
+	$ci->load->model('content/Content_model', 'ContentModel');
+	$result = $ci->ContentModel->getMenu(defined('CIS4_MENU_ENTRY') ? CIS4_MENU_ENTRY : null, get_uid());
+	$menu = getData($result)->childs ?? [];
+}
 ?>
 
 <script type="text/javascript">
@@ -30,7 +37,9 @@ $this->load->view('templates/FHC-Header', $includesArray);
 		logout-url="<?= site_url('Cis/Auth/logout'); ?>"
 		:selectedtypes="selectedtypes" 
 		:searchbaroptions="searchbaroptions" 
-		:searchfunction="searchfunction" />
+		:searchfunction="searchfunction"
+		:menu="<?= htmlspecialchars(json_encode(array_values($menu)), ENT_QUOTES, 'UTF-8') ?>"
+		></cis-menu>
 </header>
 
 <main id="cis-main" class="flex-grow-1 overflow-scroll p-4">
diff --git a/public/js/components/Cis/Menu.js b/public/js/components/Cis/Menu.js
index c0b044ac0..f44819011 100755
--- a/public/js/components/Cis/Menu.js
+++ b/public/js/components/Cis/Menu.js
@@ -7,7 +7,8 @@ export default {
         FhcSearchbar
     },
     props: {
-        rootUrl: String,
+		menu: Array,
+		rootUrl: String,
         logoUrl: String,
         avatarUrl: String,
         logoutUrl: String,
@@ -27,11 +28,9 @@ export default {
 			this.activeEntry = content_id;
 		}
 	},
-    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;
-		});
-    },
+	mounted(){
+		this.entries = this.menu;
+	},
     template: /*html*/`
 	<!--<p>CISVUE HEADER</p>
 	<p>active entry content_id : {{activeEntry}}</p>