Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUG] Don't display the agent tab when the device is UNMANAGED #535

Merged
merged 1 commit into from
Nov 29, 2024
Merged

[BUG] Don't display the agent tab when the device is UNMANAGED #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions client/src/pages/Admin/Inventory/components/AgentConfigurationTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
34 changes: 19 additions & 15 deletions client/src/pages/Admin/Inventory/components/ConfigurationModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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} />,
},
];

Expand All @@ -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 />}
>
Expand All @@ -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>
);
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/Admin/Inventory/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ const Inventory: React.FC = () => {
<ConfigurationModal
handleUpdateModalOpen={handleConfigurationModalOpen}
updateModalOpen={configurationModalOpen}
values={currentRow || {}}
device={currentRow || {}}
/>

<Drawer
Expand Down