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

NETOBSERV-777 More options dropdown shows wrong items #268

Merged
merged 1 commit into from
Jan 9, 2023
Merged

NETOBSERV-777 More options dropdown shows wrong items #268

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
7 changes: 5 additions & 2 deletions web/locales/en/plugin__netobserv-plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,12 @@
"Topology": "Topology",
"Export data": "Export data",
"Export topology view": "Export topology view",
"More options": "More options",
"Display": "Display",
"Manage": "Manage",
"Panels": "Panels",
"Columns": "Columns",
"Actions": "Actions",
"Export view": "Export view",
"More options": "More options",
"Time range": "Time range",
"Refresh interval": "Refresh interval",
"Collapse": "Collapse",
Expand Down
76 changes: 48 additions & 28 deletions web/src/components/netflow-traffic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,12 +537,20 @@ export const NetflowTraffic: React.FC<{
);
};

const onTopologyExport = () => {
const svg = document.getElementsByClassName('pf-topology-visualization-surface__svg')[0];
saveSvgAsPng(svg, 'topology.png', {
backgroundColor: '#fff',
encoderOptions: 0
});
};

const viewOptionsContent = () => {
const items: JSX.Element[] = [];

if (selectedViewId === 'overview') {
items.push(
<OverflowMenuItem isPersistent key="columns">
<OverflowMenuItem key="panels">
<Button
data-test="manage-overview-panels-button"
id="manage-overview-panels-button"
Expand Down Expand Up @@ -574,7 +582,7 @@ export const NetflowTraffic: React.FC<{
);*/
} else if (selectedViewId === 'table') {
items.push(
<OverflowMenuItem isPersistent key="columns">
<OverflowMenuItem key="columns">
<Button
data-test="manage-columns-button"
id="manage-columns-button"
Expand Down Expand Up @@ -610,13 +618,7 @@ export const NetflowTraffic: React.FC<{
variant="link"
className="overflow-button"
icon={<ExportIcon />}
onClick={() => {
const svg = document.getElementsByClassName('pf-topology-visualization-surface__svg')[0];
saveSvgAsPng(svg, 'topology.png', {
backgroundColor: '#fff',
encoderOptions: 0
});
}}
onClick={() => onTopologyExport()}
>
{t('Export topology view')}
</Button>
Expand All @@ -627,6 +629,41 @@ export const NetflowTraffic: React.FC<{
};

const viewOptionsControl = () => {
const dropdownItems: JSX.Element[] = [];

if (selectedViewId === 'overview') {
dropdownItems.push(
<DropdownGroup key="panels" label={t('Manage')}>
<DropdownItem key="export" onClick={() => setOverviewModalOpen(true)}>
{t('Panels')}
</DropdownItem>
</DropdownGroup>
);
} else if (selectedViewId === 'table') {
dropdownItems.push(
<DropdownGroup key="columns" label={t('Manage')}>
<DropdownItem key="export" onClick={() => setColModalOpen(true)}>
{t('Columns')}
</DropdownItem>
</DropdownGroup>
);
dropdownItems.push(
<DropdownGroup key="export-group" label={t('Actions')}>
<DropdownItem key="export" onClick={() => setExportModalOpen(true)}>
{t('Export')}
</DropdownItem>
</DropdownGroup>
);
} else if (selectedViewId === 'topology') {
dropdownItems.push(
<DropdownGroup key="export-group" label={t('Actions')}>
<DropdownItem key="export" onClick={() => onTopologyExport()}>
{t('Export view')}
</DropdownItem>
</DropdownGroup>
);
}

return (
<Dropdown
data-test="view-options-dropdown"
Expand All @@ -645,24 +682,7 @@ export const NetflowTraffic: React.FC<{
</Button>
}
isOpen={isViewOptionOverflowMenuOpen}
dropdownItems={[
<DropdownGroup key="display-group" label={t('Display')}>
<DropdownItem key="s" onClick={() => setSize('s')}>
{t('Compact')}
</DropdownItem>
<DropdownItem key="m" onClick={() => setSize('m')}>
{t('Normal')}
</DropdownItem>
<DropdownItem key="l" onClick={() => setSize('l')}>
{t('Large')}
</DropdownItem>
</DropdownGroup>,
<DropdownGroup key="export-group" label={t('Actions')}>
<DropdownItem key="export" onClick={() => setExportModalOpen(true)}>
{t('Export')}
</DropdownItem>
</DropdownGroup>
]}
dropdownItems={dropdownItems}
/>
);
};
Expand Down Expand Up @@ -719,7 +739,7 @@ export const NetflowTraffic: React.FC<{
const filtersExtraContent = () => {
const items: JSX.Element[] = [];
items.push(
<OverflowMenuItem key="fullscreen" isPersistent={selectedViewId === 'topology'}>
<OverflowMenuItem key="fullscreen">
<Button
data-test="fullscreen-button"
id="fullscreen-button"
Expand Down