Provider Mode: Object Dashboard: fix RGW performance card

Signed-off-by: Alfonso Martínez <[email protected]>
red-hat-storage · Jul 29, 2024 · 834aed0 · 834aed0
1 parent 8956496
commit 834aed0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/packages/ocs/dashboards/object-service/data-consumption-card/data-consumption-card.tsx b/packages/ocs/dashboards/object-service/data-consumption-card/data-consumption-card.tsx
@@ -219,7 +219,7 @@ const ServiceTypeRGW: React.FC<ServiceTypeProps> = ({ queries, metric }) => {
   const loading = getLoading || putLoading;
   const error = !!getError || !!putError;
   const data = !!get && !!put;
-  const response: Response = React.useMemo(() => {
+  const response: DataPoint<Date>[][] = React.useMemo(() => {
     return !loading && !error && data
       ? [...getRangeVectorStats(get), ...getRangeVectorStats(put)]
       : [];
@@ -229,7 +229,7 @@ const ServiceTypeRGW: React.FC<ServiceTypeProps> = ({ queries, metric }) => {
     <PerformanceGraph
       loading={loading}
       loadError={error}
-      dataPoints={response as DataPoint[][][]}
+      dataPoints={response}
       metricType={metric}
     />
   );

diff --git a/packages/ocs/dashboards/object-service/data-consumption-card/performance-graph.tsx b/packages/ocs/dashboards/object-service/data-consumption-card/performance-graph.tsx
@@ -22,7 +22,7 @@ import { convertNaNToNull, getLatestValue } from '../../../utils';
 import './data-consumption-card.scss';
 
 type PerformanceGraphProps = {
-  dataPoints: DataPoint[][][];
+  dataPoints: DataPoint[][];
   loading: boolean;
   loadError: boolean;
   metricType: string;
@@ -41,8 +41,8 @@ const PerformanceGraph: React.FC<PerformanceGraphProps> = ({
     metricType === Metrics.BANDWIDTH
       ? humanizeDecimalBytesPerSec
       : humanizeSeconds;
-  const getData = getDataArray?.[0]?.map(convertNaNToNull);
-  const putData = putDataArray?.[0]?.map(convertNaNToNull);
+  const getData = getDataArray?.map(convertNaNToNull);
+  const putData = putDataArray?.map(convertNaNToNull);
   const PUTLatestValue = humanize(getLatestValue(putData)).string;
   const GETLatestValue = humanize(getLatestValue(getData)).string;
 
@@ -53,10 +53,10 @@ const PerformanceGraph: React.FC<PerformanceGraphProps> = ({
 
   const emptyData = dataPoints.some(_.isEmpty);
 
-  if (loadError && emptyData) {
+  if (loadError || emptyData) {
     return <GraphEmpty />;
   }
-  if (!loading && !loadError && !emptyData) {
+  if (!loading) {
     return (
       <>
         <div className="nb-data-consumption-card__chart-label text-secondary">

diff --git a/packages/shared/src/details-page/datetime.ts b/packages/shared/src/details-page/datetime.ts
@@ -220,6 +220,9 @@ export const twentyFourHourTime = (
   date: Date,
   showSeconds?: boolean
 ): string => {
+  if (!_.isDate(date)) {
+    date = new Date(0);
+  }
   const hours = zeroPad(date.getHours() ?? 0);
   const minutes = `:${zeroPad(date.getMinutes() ?? 0)}`;
   const seconds = showSeconds ? `:${zeroPad(date.getSeconds() ?? 0)}` : '';