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

Jump to bottom

feat(NET-1445): network onvoarding improvements #698

Merged
merged 1 commit into from
Aug 16, 2024
Merged

feat(NET-1445): network onvoarding improvements #698

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
1 change: 1 addition & 0 deletions src/components/modals/new-host-modal/NewHostModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ export default function NewHostModal({

const filteredEnrollmentKeys = useMemo(
() =>
enrollmentKeys &&
enrollmentKeys
.filter((key) => isEnrollmentKeyValid(key))
.filter((key) =>
Expand Down
138 changes: 136 additions & 2 deletions src/pages/DashboardPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import {
Layout,
Row,
Space,
Table,
TableColumnsType,
Tooltip,
Typography,
notification,
Expand All @@ -20,21 +22,23 @@ import {
LaptopOutlined,
PlusOutlined,
QuestionCircleOutlined,
ReloadOutlined,
SearchOutlined,
} from '@ant-design/icons';
import UpgradeModal from '../components/modals/upgrade-modal/UpgradeModal';
import { PageProps } from '../models/Page';
import { AppRoutes } from '../routes';
import { useNavigate } from 'react-router-dom';
import { Link, useNavigate } from 'react-router-dom';
import AddNetworkModal from '@/components/modals/add-network-modal/AddNetworkModal';
import { useEffect, useMemo, useState } from 'react';
import { useStore } from '@/store/store';
import { getAmuiUrl, getLicenseDashboardUrl, resolveAppRoute } from '@/utils/RouteUtils';
import { getAmuiUrl, getLicenseDashboardUrl, getNetworkRoute, resolveAppRoute } from '@/utils/RouteUtils';
import NewHostModal from '@/components/modals/new-host-modal/NewHostModal';
import { isSaasBuild } from '@/services/BaseService';
import { useBranding } from '@/utils/Utils';
import QuickSetupModal from '@/components/modals/quick-setup-modal/QuickSetupModal';
import { UsecaseQuestionKey } from '@/constants/NetworkUseCases';
import { Network } from '@/models/Network';

export type TourType =
| 'relays'
Expand Down Expand Up @@ -62,6 +66,7 @@ export default function DashboardPage(props: PageProps) {
const [isNewHostModalOpen, setIsNewHostModalOpen] = useState(false);
const [showUpgradeAlert, setShowUpgradeAlert] = useState(false);
const [isQuickSetupModalOpen, setIsQuickSetupModalOpen] = useState(false);
const [searchText, setSearchText] = useState('');
const [notify, notifyCtx] = notification.useNotification();

const jumpToTourPage = (tourType: TourType, netId?: string) => {
Expand Down Expand Up @@ -103,6 +108,79 @@ export default function DashboardPage(props: PageProps) {
break;
}
};
const filteredNetworks = useMemo(
() =>
store.networks.filter((network) => {
return network.netid.toLowerCase().includes(searchText.toLowerCase());
}),
[store.networks, searchText],
);

const tableColumns: TableColumnsType<Network> = [
{
title: 'Name',
dataIndex: 'netid',
key: 'netid',
sorter: {
compare: (a, b) => a.netid.localeCompare(b.netid),
},
defaultSortOrder: 'ascend',
render: (netId) => (
<Link to={`${resolveAppRoute(AppRoutes.NETWORKS_ROUTE)}/${encodeURIComponent(netId)}`}>{netId}</Link>
),
},
{
title: 'Address Range (IPv4)',
dataIndex: 'addressrange',
key: 'addressrange',
render: (addressRange) => (
<div onClick={(ev) => ev.stopPropagation()}>
<Typography.Text>{addressRange}</Typography.Text>
</div>
),
},
{
title: 'Address Range (IPv6)',
dataIndex: 'addressrange6',
key: 'addressrange6',
render: (addressRange6) => (
<div onClick={(ev) => ev.stopPropagation()}>
<Typography.Text>{addressRange6}</Typography.Text>
</div>
),
},
{
title: 'Hosts Count',
render(_, network) {
const nodeCount = store.nodes?.filter((node) => node.network === network.netid).length ?? 0;
return (
<div onClick={(ev) => ev.stopPropagation()}>
<Typography.Text>{nodeCount}</Typography.Text>
</div>
);
},
},
{
title: 'Network Last Modified',
dataIndex: 'networklastmodified',
key: 'networklastmodified',
render: (date) => (
<div onClick={(ev) => ev.stopPropagation()}>
<Typography.Text>{new Date(date * 1000).toLocaleString()}</Typography.Text>
</div>
),
},
{
title: 'Hosts Last Modified',
dataIndex: 'nodeslastmodified',
key: 'nodeslastmodified',
render: (date) => (
<div onClick={(ev) => ev.stopPropagation()}>
<Typography.Text>{new Date(date * 1000).toLocaleString()}</Typography.Text>
</div>
),
},
];

useEffect(() => {
if (!isServerEE && !isSaasBuild && !store.serverStatus.status?.is_on_trial_license) {
Expand Down Expand Up @@ -348,6 +426,62 @@ export default function DashboardPage(props: PageProps) {
</div>
</Card>
)}
{store.networks.length > 0 && (
<>
<Row>
<Col xs={24}>
<Typography.Text
style={{
fontSize: '1.5rem',
fontWeight: 600,
}}
>
Networks
</Typography.Text>
</Col>
</Row>

<Row justify="space-between">
<Col xs={24} md={8}>
<Input
size="large"
placeholder="Search networks"
value={searchText}
onChange={(ev) => setSearchText(ev.target.value)}
prefix={<SearchOutlined />}
/>
</Col>
<Col xs={24} md={16} style={{ textAlign: 'right' }} className="networks-table-button">
<Button size="large" style={{ marginRight: '0.5em' }} onClick={() => store.fetchNetworks()}>
<ReloadOutlined /> Reload Networks
</Button>
<Button type="primary" size="large" onClick={() => setIsAddNetworkModalOpen(true)}>
<PlusOutlined /> Create Network
</Button>
</Col>
</Row>

<Row justify="space-between">
<Col xs={24}>
<div className="table-wrapper">
<Table
columns={tableColumns}
dataSource={filteredNetworks}
rowKey="netid"
scroll={{ x: true }}
onRow={(network) => {
return {
onClick: () => {
navigate(getNetworkRoute(network));
},
};
}}
/>
</div>
</Col>
</Row>
</>
)}
</Space>
</Col>
</Row>
Expand Down
Loading