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

SecGroup UI bugs fixes and improvements #1483

Merged
merged 2 commits into from
Oct 1, 2023
Merged

SecGroup UI bugs fixes and improvements #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6370500
SecGroup UI bugs fixes and improvements
nerdalert Oct 1, 2023
7705762
Resolve the state refresh between table view and table edit
nerdalert Oct 1, 2023
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
60 changes: 11 additions & 49 deletions ui/src/pages/Devices.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ import {
} from "react-admin";
import OnlineIcon from "@mui/icons-material/CheckCircleOutline";
import HighlightOffIcon from "@mui/icons-material/HighlightOff";
import HelpOutlineIcon from "@mui/icons-material/HelpOutline";
import { useTheme } from "@mui/material/styles";
import { Tooltip } from "@mui/material";

const DeviceListBulkActions = () => (
<div style={{ display: "flex", justifyContent: "space-between" }}>
Expand Down Expand Up @@ -131,56 +133,16 @@ const DeviceShowLayout: FC = () => {
reference="users"
link="show"
/>
<TextField label="Online" source="online" />
<div style={{ display: "flex", alignItems: "center" }}>
<TextField label="Online" source="online" />
<Tooltip
title="Online Status displays the nexodus agent's control plane connection status to the API server."
placement="right"
>
<HelpOutlineIcon fontSize="small" style={{ marginLeft: "5px" }} />
</Tooltip>
</div>
<ConditionalOnlineSinceField />
</SimpleShowLayout>
);
};

//
// export const DeviceShow: FC = () => (
// <Show>
// <SimpleShowLayout>
// <TextField label="ID" source="id" />
// <TextField label="Hostname" source="hostname" />
// <TextField label="Public Key" source="public_key" />
// <TextField label="Tunnel IP" source="tunnel_ip" />
// <TextField label="Organization Prefix" source="organization_prefix" />
// <TextField label="Allowed IPs" source="allowed_ips" />
// <ArrayField label="Endpoints" source="endpoints">
// <Datagrid rowClick="show" bulkActionButtons={false}>
// <TextField label="Address" source="address" />
// <TextField label="Distance" source="distance" />
// <TextField label="Source" source="source" />
// </Datagrid>
// </ArrayField>
// <TextField label="Online" source="online" />
// <DateField
// label="Online Since"
// source="online_at"
// options={{
// weekday: "long",
// year: "numeric",
// month: "long",
// day: "numeric",
// hour: "numeric",
// minute: "numeric",
// second: "numeric",
// }}
// />
// <TextField label="Relay Node" source="relay" />
// <ReferenceField
// label="Organization"
// source="organization_id"
// reference="organizations"
// link="show"
// />
// <ReferenceField
// label="Owner"
// source="user_id"
// reference="users"
// link="show"
// />
// </SimpleShowLayout>
// </Show>
// );
Loading