From 5f9687a3614a2386afebdebb2c26f9e1602afd15 Mon Sep 17 00:00:00 2001
From: Chaim Lev-Ari <chiptus@users.noreply.github.com>
Date: Thu, 5 Oct 2023 10:31:08 +0300
Subject: [PATCH] fix(edge/waitingroom): hide sidebar when disabled [EE-6003]
 (#10343)

---
 app/react/sidebar/EdgeComputeSidebar.tsx | 20 +++++++++++++++++++-
 app/react/sidebar/Sidebar.tsx            |  4 ++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/react/sidebar/EdgeComputeSidebar.tsx b/app/react/sidebar/EdgeComputeSidebar.tsx
index e7614898b..d9924986f 100644
--- a/app/react/sidebar/EdgeComputeSidebar.tsx
+++ b/app/react/sidebar/EdgeComputeSidebar.tsx
@@ -1,11 +1,21 @@
-import { Box, Clock, LayoutGrid, Layers } from 'lucide-react';
+import { Box, Clock, LayoutGrid, Layers, Puzzle } from 'lucide-react';
 
 import { isBE } from '../portainer/feature-flags/feature-flags.service';
+import { useSettings } from '../portainer/settings/queries';
 
 import { SidebarItem } from './SidebarItem';
 import { SidebarSection } from './SidebarSection';
 
 export function EdgeComputeSidebar() {
+  // this sidebar is rendered only for admins, so we can safely assume that settingsQuery will succeed
+  const settingsQuery = useSettings();
+
+  if (!settingsQuery.data || !settingsQuery.data.EnableEdgeComputeFeatures) {
+    return null;
+  }
+
+  const settings = settingsQuery.data;
+
   return (
     <SidebarSection title="Edge compute">
       <SidebarItem
@@ -27,6 +37,14 @@ export function EdgeComputeSidebar() {
         data-cy="portainerSidebar-edgeJobs"
       />
       {isBE && (
+        <SidebarItem
+          to="edge.configurations"
+          label="Edge Configurations"
+          icon={Puzzle}
+          data-cy="portainerSidebar-edgeConfigurations"
+        />
+      )}
+      {isBE && !settings.TrustOnFirstConnect && (
         <SidebarItem
           to="edge.devices.waiting-room"
           label="Waiting Room"
diff --git a/app/react/sidebar/Sidebar.tsx b/app/react/sidebar/Sidebar.tsx
index 11f5c6afa..3139ceb21 100644
--- a/app/react/sidebar/Sidebar.tsx
+++ b/app/react/sidebar/Sidebar.tsx
@@ -25,7 +25,7 @@ export function Sidebar() {
     return null;
   }
 
-  const { EnableEdgeComputeFeatures, LogoURL } = settingsQuery.data;
+  const { LogoURL } = settingsQuery.data;
 
   return (
     /* in the future (when we remove r2a) this should wrap the whole app - to change root styles */
@@ -50,7 +50,7 @@ export function Sidebar() {
                 data-cy="portainerSidebar-home"
               />
               <EnvironmentSidebar />
-              {isAdmin && EnableEdgeComputeFeatures && <EdgeComputeSidebar />}
+              {isAdmin && <EdgeComputeSidebar />}
               <SettingsSidebar isAdmin={isAdmin} isTeamLeader={isTeamLeader} />
             </ul>
           </div>