some ui tweaks and fixes.

AnglesHQ · Dec 3, 2023 · cf739d0 · cf739d0
1 parent 8556e36
commit cf739d0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/src/components/pages/dashboard/charts/ExecutionBarChart.js b/src/components/pages/dashboard/charts/ExecutionBarChart.js
@@ -3,7 +3,7 @@ import Chart from 'react-apexcharts';
 import { Panel, Stack } from 'rsuite';
 import { useIntl } from 'react-intl';
 import moment from 'moment';
-import { getBuildDurationInSeconds } from '../../../../utility/TimeUtilities';
+// import { getBuildDurationInSeconds } from '../../../../utility/TimeUtilities';
 
 const defaultOptions = {
   chart: {
@@ -70,7 +70,7 @@ const generateResultsData = (builds) => {
     SKIPPED: [],
     ERROR: [],
     FAIL: [],
-    executionTimes: [],
+    // executionTimes: [],
   };
 
   const buildsToReverse = [...builds];
@@ -85,7 +85,7 @@ const generateResultsData = (builds) => {
     results.SKIPPED.push(SKIPPED || 0);
     results.ERROR.push(ERROR || 0);
     results.FAIL.push(FAIL || 0);
-    results.executionTimes.push(getBuildDurationInSeconds(build));
+    // results.executionTimes.push(getBuildDurationInSeconds(build));
     graphData.labels.push(moment(build.start).format('YYYY-MM-DD hh:mm:ss'));
   });
   graphData.data.push(
@@ -109,11 +109,11 @@ const generateResultsData = (builds) => {
       data: results.FAIL,
       type: 'column',
     },
-    {
-      name: intl.formatMessage({ id: 'page.dashboard.chart.barchart.execution-time-seconds' }),
-      data: results.executionTimes,
-      type: 'line',
-    },
+    // {
+    //   name: intl.formatMessage({ id: 'page.dashboard.chart.barchart.execution-time-seconds' }),
+    //   data: results.executionTimes,
+    //   type: 'line',
+    // },
   );
   return graphData;
 };

diff --git a/src/components/pages/metrics/charts/ExecutionMetricsResultsBarChart.js b/src/components/pages/metrics/charts/ExecutionMetricsResultsBarChart.js
@@ -91,8 +91,7 @@ const generateMetricsResultsData = (metrics) => {
 
 const ExecutionMetricsResultsBarChart = function (props) {
   const { metrics, title, yaxisTitle } = props;
-  const config = { title: { text: yaxisTitle } };
-  defaultOptions.yaxis.push(config);
+  defaultOptions.yaxis = [{ title: { text: yaxisTitle } }];
   const { data, labels } = generateMetricsResultsData(metrics);
   return (
     <Panel

diff --git a/src/components/pages/metrics/charts/PhaseMetricsResultsBarChart.js b/src/components/pages/metrics/charts/PhaseMetricsResultsBarChart.js
@@ -70,7 +70,7 @@ const generateMetricsResultsData = (metrics) => {
 
 const PhaseMetricsResultsBarChart = function (props) {
   const { metrics, title, yaxisTitle } = props;
-  defaultOptions.yaxis.push({ title: { text: yaxisTitle } });
+  defaultOptions.yaxis = [{ title: { text: yaxisTitle } }];
   const graphData = generateMetricsResultsData(metrics);
   const { data, labels } = graphData;
   return (

diff --git a/src/containers/App.js b/src/containers/App.js
@@ -223,7 +223,7 @@ const App = function (props) {
           </Sidenav>
         </Affix>
       </Sidebar>
-      <Container>
+      <Container className="main-container">
         <Content className="main-content">
           <main>
             {

diff --git a/src/styles/index.less b/src/styles/index.less
@@ -125,6 +125,7 @@
 
 body {
     background: var(--body-background);
+    overflow-x: hidden;
 }
 
 .main-sidebar {
@@ -173,6 +174,10 @@ body {
     }
 }
 
+.main-container {
+    min-width: 1000px;
+}
+
 // modifying the default rsuite table
 .rs-table {
     background-color: transparent;