From 3f7b81e4b0ba092528cc168b64dda0dd88dffbcc Mon Sep 17 00:00:00 2001
From: SquirrelDevelopper <squirrel@squirrelserversmanager.io>
Date: Fri, 29 Nov 2024 16:14:38 +0100
Subject: [PATCH] Don't display the agent tab when the device is UNMANAGED

Refactor device configuration component props

Renamed props from 'values' to 'device' for clarity and consistency across components. Removed unused icon imports and refactored the configuration modal to conditionally display tabs based on device status. This enhances code readability and maintains uniform naming conventions.
---
 .../components/AgentConfigurationTab.tsx      |  5 +--
 .../components/ConfigurationModal.tsx         | 34 +++++++++++--------
 client/src/pages/Admin/Inventory/index.tsx    |  2 +-
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/client/src/pages/Admin/Inventory/components/AgentConfigurationTab.tsx b/client/src/pages/Admin/Inventory/components/AgentConfigurationTab.tsx
index 161a9286..ab9fc358 100644
--- a/client/src/pages/Admin/Inventory/components/AgentConfigurationTab.tsx
+++ b/client/src/pages/Admin/Inventory/components/AgentConfigurationTab.tsx
@@ -1,8 +1,5 @@
 import AgentInstallMethod from '@/components/DeviceConfiguration/AgentInstallMethod';
-import {
-  ConfigurationSolid,
-  GrommetIconsInstall,
-} from '@/components/Icons/CustomIcons';
+import { GrommetIconsInstall } from '@/components/Icons/CustomIcons';
 import { updateAgentInstallMethod } from '@/services/rest/device';
 import { InfoCircleFilled } from '@ant-design/icons';
 import { ProForm, ProFormDependency } from '@ant-design/pro-components';
diff --git a/client/src/pages/Admin/Inventory/components/ConfigurationModal.tsx b/client/src/pages/Admin/Inventory/components/ConfigurationModal.tsx
index dde1ed43..b7275ddf 100644
--- a/client/src/pages/Admin/Inventory/components/ConfigurationModal.tsx
+++ b/client/src/pages/Admin/Inventory/components/ConfigurationModal.tsx
@@ -1,40 +1,40 @@
-import { ServerEnvironmentSvg } from '@/components/Icons/CustomIcons';
 import AgentConfigurationTab from '@/pages/Admin/Inventory/components/AgentConfigurationTab';
 import DiagnosticTab from '@/pages/Admin/Inventory/components/DiagnosticTab';
 import DockerConfigurationForm from '@/pages/Admin/Inventory/components/DockerConfigurationForm';
 import SSHConfigurationForm from '@/pages/Admin/Inventory/components/SSHConfigurationForm';
-import { DockerOutlined } from '@ant-design/icons';
 import { Modal, Tabs, TabsProps } from 'antd';
 import React from 'react';
 import { API } from 'ssm-shared-lib';
+import { SsmStatus } from 'ssm-shared-lib';
 
 export type ConfigurationModalProps = {
   updateModalOpen: boolean;
   handleUpdateModalOpen: any;
-  values: Partial<API.DeviceItem>;
+  device: Partial<API.DeviceItem>;
 };
 
 const ConfigurationModal: React.FC<ConfigurationModalProps> = (props) => {
+  const { updateModalOpen, handleUpdateModalOpen, device } = props;
   const items: TabsProps['items'] = [
     {
-      key: '1',
+      key: 'ssh',
       label: 'SSH',
-      children: <SSHConfigurationForm values={props.values} />,
+      children: <SSHConfigurationForm values={device} />,
     },
     {
-      key: '2',
+      key: 'docker',
       label: 'Docker',
-      children: <DockerConfigurationForm device={props.values} />,
+      children: <DockerConfigurationForm device={device} />,
     },
     {
-      key: '3',
+      key: 'diagnostic',
       label: 'Diagnostic',
-      children: <DiagnosticTab device={props.values} />,
+      children: <DiagnosticTab device={device} />,
     },
     {
-      key: '4',
+      key: 'agent',
       label: 'Agent',
-      children: <AgentConfigurationTab device={props.values} />,
+      children: <AgentConfigurationTab device={device} />,
     },
   ];
 
@@ -43,10 +43,10 @@ const ConfigurationModal: React.FC<ConfigurationModalProps> = (props) => {
       style={{ padding: '32px 40px 48px' }}
       width={1000}
       destroyOnClose
-      title={`${props.values.hostname || 'Unknown device'} (${props.values.ip})`}
-      open={props.updateModalOpen}
+      title={`${device.hostname || 'Unknown device'} (${device.ip})`}
+      open={updateModalOpen}
       onCancel={() => {
-        props.handleUpdateModalOpen(false);
+        handleUpdateModalOpen(false);
       }}
       footer={() => <div />}
     >
@@ -55,7 +55,11 @@ const ConfigurationModal: React.FC<ConfigurationModalProps> = (props) => {
           console.log(key);
         }}
         type="card"
-        items={items}
+        items={
+          device.status === SsmStatus.DeviceStatus.UNMANAGED
+            ? items.filter((e) => e.key !== 'agent')
+            : items
+        }
       />
     </Modal>
   );
diff --git a/client/src/pages/Admin/Inventory/index.tsx b/client/src/pages/Admin/Inventory/index.tsx
index d2024c7c..c0a82654 100644
--- a/client/src/pages/Admin/Inventory/index.tsx
+++ b/client/src/pages/Admin/Inventory/index.tsx
@@ -255,7 +255,7 @@ const Inventory: React.FC = () => {
       <ConfigurationModal
         handleUpdateModalOpen={handleConfigurationModalOpen}
         updateModalOpen={configurationModalOpen}
-        values={currentRow || {}}
+        device={currentRow || {}}
       />
 
       <Drawer