diff --git a/src/pages/Overview/index.js b/src/pages/Overview/index.js
index 6f9e82c24..1e8e08fa7 100644
--- a/src/pages/Overview/index.js
+++ b/src/pages/Overview/index.js
@@ -7,33 +7,16 @@ import {
Text,
TextVariants,
Button,
- Tabs,
- Tab,
Progress,
ProgressSize,
ProgressMeasureLocation,
ProgressVariant,
} from '@patternfly/react-core';
-import {
- Chart,
- ChartBar,
- ChartAxis,
- ChartStack,
- ChartVoronoiContainer,
- ChartDonutThreshold,
- ChartDonutUtilization,
- ChartThemeColor,
-} from '@patternfly/react-charts';
import { Icon } from 'antd';
import { connect } from 'dva';
import moment from 'moment';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import {
- OutlinedClockIcon,
- UndoAltIcon,
- ExternalLinkAltIcon,
- EllipsisVIcon,
-} from '@patternfly/react-icons';
+import { OutlinedClockIcon, UndoAltIcon, EllipsisVIcon } from '@patternfly/react-icons';
import { faExclamationCircle } from '@fortawesome/free-solid-svg-icons';
import { resultData, expirationLimit } from '../../../mock/overview';
import Table from '@/components/Table';
@@ -49,8 +32,6 @@ class Overview extends React.Component {
constructor(props) {
super(props);
this.state = {
- activeTabKey: 0,
- barWidth: '20',
totalResultData: resultData,
newData: [],
unlabledData: [],
@@ -119,14 +100,8 @@ class Overview extends React.Component {
);
};
- handleTabClick = (event, tabIndex) => {
- this.setState({
- activeTabKey: tabIndex,
- });
- };
-
render() {
- const { activeTabKey, barWidth, newData, unlabledData } = this.state;
+ const { newData, unlabledData } = this.state;
const newDataColumns = [
{
@@ -294,587 +269,206 @@ class Overview extends React.Component {
return (
-
-
-
-
- Overview
-
-
-
-
-
-
-
-
- Expiring Soon
-
-
- These runs will be automatically deleted from the sysem if left
- unacknowledged.
-
-
-
-
-
-
-
-
-
-
- 2020-09-10T
- 11:52:34:552478
-
-
-
-
-
-
-
-
-
- 2020-09-10T
- 11:52:34:552478
-
-
-
-
-
-
-
-
-
- 2020-09-10T
- 11:52:34:552478
-
-
-
-
-
-
-
-
-
- 2020-09-10T
- 11:52:34:552478
-
-
-
-
-
-
-
-
-
- 2020-09-10T
- 11:52:34:552478
-
-
-
-
-
-
-
-
-
- 2020-09-10T
- 11:52:34:552478
-
-
-
-
-
-
-
-
-
- 2020-09-10T
- 11:52:34:552478
-
-
-
-
-
-
-
-
-
- 2020-09-10T
- 11:52:34:552478
-
-
-
-
-
-
-
-
-
- 2020-09-10T
- 11:52:34:552478
-
-
-
-
+
+ Overview
+
+
+
+
+
+
+
+
+ Expiring Soon
+
+
+ These runs will be automatically deleted from the sysem if left unacknowledged.
+
+
+
+
+
+
+
+
+
+
+ 2020-09-10T 11:52:34:552478
+
+
+
+
+
+
+
+
+
+ 2020-09-10T 11:52:34:552478
+
+
+
+
+
+
+
+
+
+ 2020-09-10T 11:52:34:552478
+
+
+
+
+
+
+
+
+
+ 2020-09-10T 11:52:34:552478
+
+
+
+
+
+
+
+
+
+ 2020-09-10T 11:52:34:552478
+
+
+
+
+
+
+
+
+
+ 2020-09-10T 11:52:34:552478
+
+
+
+
+
+
+
+
+
+ 2020-09-10T 11:52:34:552478
+
+
+
+
+
+
+
+
+
+ 2020-09-10T 11:52:34:552478
+
+
+
+
+
+
+
+
+
+ 2020-09-10T 11:52:34:552478
+
+
+
+
-
-
-
-
-
- 2020-09-10T
- 11:52:34:552478
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {' '}
- New Runs
- } style={{ float: 'right' }}>
- Refresh results
-
-
-
-
-
-
(
- {record.description}
- )}
- dataSource={newData}
- />
-
-
-
-
-
-
-
-
-
- Unlabled
-
-
-
-
-
(
- {record.description}
- )}
- dataSource={unlabledData}
- />
-
-
-
-
-
-
-
-
-
-
-
- Analysis
-
-
-
- {' '}
- Total runs: 1,179
-
-
-
-
-
-
-
-
-
-
- {' '}
- Runs
- }
- style={{ float: 'right' }}
- >
- View in Kibana
-
-
-
-
-
-
-
-
-
-
- {' '}
- Click on sections of the graph to view detailed data
-
-
-
-
-
- (datum.x ? datum.x : null)}
- >
-
- datum.x ? `${datum.x}: ${datum.y}%` : null
- }
- themeColor={ChartThemeColor.yellow}
- thresholds={[{ value: 60 }, { value: 90 }]}
- />
-
-
-
-
-
- (datum.x ? datum.x : null)}
- >
-
- datum.x ? `${datum.x}: ${datum.y}%` : null
- }
- />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Legend
-
-
-
- ip-172-31-88-27.ec2.internal
-
- perf44-85qp8-infra-c-6qtbg.c
-
-
- dhcp31-25.perf.lab.eng.bos.redhat.com
-
-
-
- frival-l64sv2-rhel8-Standard-L64s-v2-1-vm
-
-
- scale-ci-http-dzms4
-
-
-
-
-
-
-
-
-
-
-
- {' '}
- Runs over time
- }
- style={{ float: 'right' }}
- >
- View in Kibana
-
-
-
-
-
-
-
-
-
-
- {' '}
- @metadata.satellite.EC2: filters
-
-
-
-
- `${datum.name}: ${datum.y}`}
- constrainToVisibleArea
- />
- }
- domainPadding={{ x: [50, 50] }}
- height={500}
- padding={{
- bottom: 50,
- left: 50,
- right: 200,
- top: 50,
- }}
- width={1200}
- >
-
-
-
-
-
-
-
-
-
-
- {' '}
- NOT @metadata.satellite.EC2: filters
-
-
-
- `${datum.name}: ${datum.y}`}
- constrainToVisibleArea
- />
- }
- domainPadding={{ x: [50, 50] }}
- height={500}
- padding={{
- bottom: 50,
- left: 50,
- right: 200,
- top: 50,
- }}
- themeColor={ChartThemeColor.gold}
- width={1200}
- >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Legend
-
-
-
- pbench-user-benchmark
-
-
-
- trafficgen
-
-
-
- uperf
-
-
-
- linpack
-
-
-
- fio
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 2020-09-10T 11:52:34:552478
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {' '}
+ New Runs
+ } style={{ float: 'right' }}>
+ Refresh results
+
+
+
+
+
+
{record.description}
}
+ dataSource={newData}
+ />
+
+
+
+
+
+
+
+
+
+ Unlabled
+
+
+
+
+
{record.description}
}
+ dataSource={unlabledData}
+ />
+
+
+
+
);
}
diff --git a/src/pages/Overview/index.less b/src/pages/Overview/index.less
index bc01c6aec..b1bd75eda 100644
--- a/src/pages/Overview/index.less
+++ b/src/pages/Overview/index.less
@@ -3,16 +3,16 @@
}
*::-webkit-scrollbar-thumb {
height: 1em;
- border: 0.5em solid rgba(0, 0, 0, 0);
+ background-color: rgba(0, 0, 0, 0.15);
background-clip: padding-box;
+ border: 0.5em solid rgba(0, 0, 0, 0);
-webkit-border-radius: 1em;
- background-color: rgba(0, 0, 0, 0.15);
-webkit-box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.025);
}
*::-webkit-scrollbar-button {
+ display: none;
width: 0;
height: 0;
- display: none;
}
*::-webkit-scrollbar-corner {
background-color: transparent;
@@ -42,8 +42,8 @@
}
.subText {
- font-size: smaller;
color: #4c4c4c;
+ font-size: smaller;
}
.icons {
@@ -52,46 +52,25 @@
.label {
margin: 3px;
- background-color: rgb(220 239 255);
padding: 2px 8px;
+ background-color: rgb(220 239 255);
border-radius: 25px;
}
-.borderedCard {
- border: solid 1px #b3b2b2;
-}
-.colorBox,
-.colorBoxInline {
- width: 0.7rem;
- height: 0.7rem;
- margin-left: 24px;
- display: inline-block;
-}
-
-.colorBoxInline {
- display: inline-block;
-}
-
-.legendLabel {
- margin-left: 8px;
- font-size: var(--pf-global--FontSize--sm);
- color: var(--pf-global--Color--300);
-}
-
.dropdownContent {
position: absolute;
- background-color: #f1f1f1;
- margin-left: -5%;
min-width: 130px;
+ margin-left: -5%;
overflow: auto;
+ background-color: #f1f1f1;
box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2);
}
.dropdownLink {
- color: black;
+ display: block;
padding: 12px 16px;
+ color: black;
text-decoration: none;
- display: block;
}
.dropdownLink:hover {