Skip to content

ROX-13464 adding flows dropdown in NG #3763

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

Merged
alwayshooin merged 2 commits into from
Nov 11, 2022
Merged

ROX-13464 adding flows dropdown in NG #3763

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
5fcb6d4
ROX-13464 adding flows dropdown in NG and adding placeholder buttons …
alwayshooin Nov 9, 2022
55b0c9f
addressing PR comments and adding more filler text for now
alwayshooin Nov 10, 2022
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
46 changes: 46 additions & 0 deletions ui/apps/platform/src/Containers/NetworkGraph/EdgeStateSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import React, { useState } from 'react';
import { Select, SelectOption } from '@patternfly/react-core';

export type EdgeState = 'active' | 'extraneous';
type EdgeStateSelectProps = {
edgeState: EdgeState;
setEdgeState: (state) => void;
};

function EdgeStateSelect({ edgeState, setEdgeState }: EdgeStateSelectProps) {
const [isOpen, setIsOpen] = useState(false);

function onToggle() {
setIsOpen(!isOpen);
}

function onSelect() {
const newEdgeState = edgeState === 'active' ? 'extraneous' : 'active';
setEdgeState(newEdgeState);
}

return (
<Select
variant="single"
isOpen={isOpen}
onToggle={onToggle}
onSelect={onSelect}
selections={edgeState}
>
<SelectOption
value="active"
description="Traffic observed in your selected time window."
>
Active traffic
</SelectOption>
<SelectOption
value="extraneous"
description="Inactive flows allowed by your network policies in your selected time window."
>
Extraneous flows
</SelectOption>
</Select>
);
}

export default EdgeStateSelect;
44 changes: 42 additions & 2 deletions ui/apps/platform/src/Containers/NetworkGraph/NetworkGraphPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
import React, { useEffect, useState } from 'react';
import { PageSection, Title, Flex, FlexItem, Bullseye, Spinner } from '@patternfly/react-core';
import {
PageSection,
Title,
Flex,
FlexItem,
Bullseye,
Spinner,
Button,
Divider,
Toolbar,
ToolbarContent,
ToolbarGroup,
ToolbarItem,
} from '@patternfly/react-core';
import { Model } from '@patternfly/react-topology';

import { fetchNetworkFlowGraph } from 'services/NetworkService';
import { fetchClustersAsArray, Cluster } from 'services/ClustersService';

import PageTitle from 'Components/PageTitle';
import EdgeStateSelect, { EdgeState } from './EdgeStateSelect';
import NetworkGraph from './NetworkGraph';
import { transformData, graphModel } from './utils';

Expand All @@ -16,6 +30,7 @@ const emptyModel = {
};

function NetworkGraphPage() {
const [edgeState, setEdgeState] = useState<EdgeState>('active');
const [model, setModel] = useState<Model>(emptyModel);
const [isLoading, setIsLoading] = useState(false);
const [clusters, setClusters] = useState<Cluster[]>([]);
Expand Down Expand Up @@ -53,9 +68,34 @@ function NetworkGraphPage() {
<FlexItem flex={{ default: 'flex_1' }}>
<Title headingLevel="h1">Network Graph</Title>
</FlexItem>
<Button variant="secondary">Manage CIDR blocks</Button>
<Button variant="secondary">Simulate network policy</Button>
</Flex>
</PageSection>
<PageSection className="network-graph no-padding">
<Divider component="div" />
<PageSection className="network-graph" padding={{ default: 'noPadding' }}>
<Toolbar data-testid="network-graph-toolbar">
<ToolbarContent>
<ToolbarGroup variant="filter-group">
<ToolbarItem>
<EdgeStateSelect
edgeState={edgeState}
setEdgeState={setEdgeState}
/>
</ToolbarItem>
<ToolbarItem>in the past hour</ToolbarItem>
</ToolbarGroup>
<ToolbarGroup>
<ToolbarItem>Add one or more deployment filters</ToolbarItem>
<ToolbarItem>Display options</ToolbarItem>
</ToolbarGroup>
<ToolbarGroup alignment={{ default: 'alignRight' }}>
<Divider component="div" isVertical />
<ToolbarItem>Last updated at 12:34PM</ToolbarItem>
</ToolbarGroup>
</ToolbarContent>
</Toolbar>
<Divider component="div" />
{model.nodes && <NetworkGraph model={model} />}
{isLoading && (
<Bullseye>
Expand Down