From 1bc6313e98fc7d151c80e518e2d3081d26ea2981 Mon Sep 17 00:00:00 2001
From: Yasen Pramatarov <yasen@lindeas.com>
Date: Thu, 31 Oct 2024 15:02:28 +0200
Subject: [PATCH] Fixes sidebar menu

---
 app/pages/config.php           | 49 ++++++++++++++++++----------------
 app/templates/page-sidebar.php | 16 +++++------
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/app/pages/config.php b/app/pages/config.php
index fb7a60a..5b9e727 100644
--- a/app/pages/config.php
+++ b/app/pages/config.php
@@ -102,7 +102,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
         ];
         $result = $hostObject->editHost($platform_id, $updatedHost);
         if ($result === true) {
-            $_SESSION['notice'] = "Host id \"{$_REQUEST['host']}\" edited.";
+            $_SESSION['notice'] = "Host \"{$_REQUEST['address']}:{$_REQUEST['port']}\" edited.";
         } else {
             $_SESSION['error'] = "Editing the host failed. Error: $result";
         }
@@ -220,29 +220,32 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             }
             break;
 
-    // if there is no $item, we work on the local config DB
         default:
-            switch ($action) {
-                case 'add-agent':
-                    $jilo_agent_types = $agentObject->getAgentTypes();
-                    $jilo_agents_in_platform = $agentObject->getPlatformAgentTypes($platform_id);
-                    $jilo_agent_types_in_platform = array_column($jilo_agents_in_platform, 'agent_type_id');
-                    include '../app/templates/config-add-agent.php';
-                    break;
-                case 'edit':
-                    if (isset($_GET['agent'])) {
-                        $agentDetails = $agentObject->getAgentDetails($platform_id, $agent);
-                        $jilo_agent_types = $agentObject->getAgentTypes();
-                        include '../app/templates/config-edit-agent.php';
-                    }
-                    break;
-                case 'delete':
-                    if (isset($_GET['agent'])) {
-                        $agentDetails = $agentObject->getAgentDetails($platform_id, $agent);
-                        include '../app/templates/config-delete-agent.php';
-                    }
-                    break;
-            }
+        // the default config page is the platforms page
+            header("Location: $app_root?page=config&item=platform");
+            exit();
+
+//            switch ($action) {
+//                case 'add-agent':
+//                    $jilo_agent_types = $agentObject->getAgentTypes();
+//                    $jilo_agents_in_platform = $agentObject->getPlatformAgentTypes($platform_id);
+//                    $jilo_agent_types_in_platform = array_column($jilo_agents_in_platform, 'agent_type_id');
+//                    include '../app/templates/config-add-agent.php';
+//                    break;
+//                case 'edit':
+//                    if (isset($_GET['agent'])) {
+//                        $agentDetails = $agentObject->getAgentDetails($platform_id, $agent);
+//                        $jilo_agent_types = $agentObject->getAgentTypes();
+//                        include '../app/templates/config-edit-agent.php';
+//                    }
+//                    break;
+//                case 'delete':
+//                    if (isset($_GET['agent'])) {
+//                        $agentDetails = $agentObject->getAgentDetails($platform_id, $agent);
+//                        include '../app/templates/config-delete-agent.php';
+//                    }
+//                    break;
+//            }
     }
 }
 
diff --git a/app/templates/page-sidebar.php b/app/templates/page-sidebar.php
index 3adcbec..794fc4f 100644
--- a/app/templates/page-sidebar.php
+++ b/app/templates/page-sidebar.php
@@ -41,22 +41,22 @@ $timeNow = new DateTime('now', new DateTimeZone($userTimezone));
                         <li class="list-group-item bg-light" style="border: none;"><p class="text-end mb-0"><small>live data</small></p></li>
 
                         <a href="<?= htmlspecialchars($app_root) ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=data&item=graphs">
-                            <li class="list-group-item<?php if ($page === 'graphs') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
+                            <li class="list-group-item<?php if ($page === 'data' && $item === 'graphs') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
                                 <i class="fas fa-chart-bar" data-toggle="tooltip" data-placement="right" data-offset="30.0" title="combined graphs"></i>combined graphs
                             </li>
                         </a>
                         <a href="<?= htmlspecialchars($app_root) ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=data&item=latest">
-                            <li class="list-group-item<?php if ($page === 'latest') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
+                            <li class="list-group-item<?php if ($page === 'data' && $item === 'latest') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
                                 <i class="fas fa-list" data-toggle="tooltip" data-placement="right" data-offset="30.0" title="latest data"></i>latest data
                             </li>
                         </a>
                         <a href="<?= htmlspecialchars($app_root) ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=data&item=configjs">
-                            <li class="list-group-item<?php if ($page === 'config' && $item === 'configjs') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
+                            <li class="list-group-item<?php if ($page === 'data' && $item === 'configjs') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
                                 <i class="fas fa-tv" data-toggle="tooltip" data-placement="right" data-offset="30.0" title="config.js"></i>config.js
                             </li>
                         </a>
                         <a href="<?= htmlspecialchars($app_root) ?>?platform=<?= htmlspecialchars($platform_id) ?>&page=data&item=interfaceconfigjs">
-                            <li class="list-group-item<?php if ($page === 'config' && $item === 'interfaceconfigjs') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
+                            <li class="list-group-item<?php if ($page === 'data' && $item === 'interfaceconfigjs') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
                                 <i class="fas fa-th" data-toggle="tooltip" data-placement="right" data-offset="30.0" title="interface_config.js"></i>interface_config.js
                             </li>
                         </a>
@@ -69,17 +69,17 @@ $timeNow = new DateTime('now', new DateTimeZone($userTimezone));
                         <li class="list-group-item bg-light" style="border: none;"><p class="text-end mb-0"><small>jitsi platforms config</small></p></li>
 
                         <a href="<?= htmlspecialchars($app_root) ?>?page=config&item=platform">
-                            <li class="list-group-item<?php if ($page === 'config' && $item === '') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
+                            <li class="list-group-item<?php if ($page === 'config' && $item === 'platform') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
                                 <i class="fas fa-sitemap" data-toggle="tooltip" data-placement="right" data-offset="30.0" title="configuration"></i>platforms
                             </li>
                         </a>
                         <a href="<?= htmlspecialchars($app_root) ?>?page=config&item=host">
-                            <li class="list-group-item<?php if ($page === 'config' && $item === '') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
+                            <li class="list-group-item<?php if ($page === 'config' && $item === 'host') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
                                 <i class="fas fa-laptop" data-toggle="tooltip" data-placement="right" data-offset="30.0" title="configuration"></i>hosts
                             </li>
                         </a>
                         <a href="<?= htmlspecialchars($app_root) ?>?page=config&item=endpoint">
-                            <li class="list-group-item<?php if ($page === 'config' && $item === '') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
+                            <li class="list-group-item<?php if ($page === 'config' && $item === 'endpoint') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
                                 <i class="fas fa-stethoscope" data-toggle="tooltip" data-placement="right" data-offset="30.0" title="configuration"></i>endpoints
                             </li>
                         </a>
@@ -88,7 +88,7 @@ $timeNow = new DateTime('now', new DateTimeZone($userTimezone));
 
 <?php if ($userObject->hasRight($user_id, 'view config file')) {?>
                         <a href="<?= htmlspecialchars($app_root) ?>?page=config&item=config_file">
-                            <li class="list-group-item<?php if ($page === 'config' && $item === '') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
+                            <li class="list-group-item<?php if ($page === 'config' && $item === 'config_file') echo ' list-group-item-secondary'; else echo ' list-group-item-action'; ?>">
                                 <i class="fas fa-wrench" data-toggle="tooltip" data-placement="right" data-offset="30.0" title="configuration"></i>config file
                             </li>
                         </a>