factoring sharedstates into their own componeonts

Signed-off-by: gitdallas <[email protected]> squash Signed-off-by: gitdallas <[email protected]> sq Signed-off-by: gitdallas <[email protected]>
opendatahub-io · Apr 8, 2024 · b00b3ed · b00b3ed
1 parent ba66146
commit b00b3ed
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 22 deletions.
diff --git a/frontend/src/pages/distributedWorkloads/components/LoadingState.tsx b/frontend/src/pages/distributedWorkloads/components/LoadingState.tsx
@@ -0,0 +1,8 @@
+import { Bullseye, Spinner } from '@patternfly/react-core';
+import React from 'react';
+
+export const LoadingState: React.FC = () => (
+  <Bullseye style={{ minHeight: 150 }}>
+    <Spinner />
+  </Bullseye>
+);
diff --git a/...utedWorkloads/components/SharedStates.tsx → ...dWorkloads/components/NoWorkloadState.tsx b/...utedWorkloads/components/SharedStates.tsx → ...dWorkloads/components/NoWorkloadState.tsx
@@ -1,13 +1,11 @@
-import * as React from 'react';
 import {
-  Bullseye,
-  Spinner,
   EmptyState,
-  EmptyStateBody,
   EmptyStateHeader,
   EmptyStateIcon,
+  EmptyStateBody,
 } from '@patternfly/react-core';
-import { CubesIcon, ExclamationTriangleIcon } from '@patternfly/react-icons';
+import { ExclamationTriangleIcon, CubesIcon } from '@patternfly/react-icons';
+import React from 'react';
 
 export const NoWorkloadState: React.FC<{ title?: string; subTitle?: string; warn?: boolean }> = ({
   title = 'No distributed workloads',
@@ -23,9 +21,3 @@ export const NoWorkloadState: React.FC<{ title?: string; subTitle?: string; warn
     <EmptyStateBody>{subTitle}</EmptyStateBody>
   </EmptyState>
 );
-
-export const LoadingState: React.FC = () => (
-  <Bullseye style={{ minHeight: 150 }}>
-    <Spinner />
-  </Bullseye>
-);
diff --git a/...tend/src/pages/distributedWorkloads/global/projectMetrics/sections/RequestedResources.tsx b/...tend/src/pages/distributedWorkloads/global/projectMetrics/sections/RequestedResources.tsx
@@ -14,7 +14,7 @@ import {
 } from '~/concepts/distributedWorkloads/utils';
 import { bytesAsPreciseGiB, roundNumber } from '~/utilities/number';
 import EmptyStateErrorMessage from '~/components/EmptyStateErrorMessage';
-import { LoadingState } from '~/pages/distributedWorkloads/components/SharedStates';
+import { LoadingState } from '~/pages/distributedWorkloads/components/LoadingState';
 
 type RequestedResourcesBulletChartProps = {
   title: string;

diff --git a/...ges/distributedWorkloads/global/projectMetrics/sections/TopResourceConsumingWorkloads.tsx b/...ges/distributedWorkloads/global/projectMetrics/sections/TopResourceConsumingWorkloads.tsx
@@ -4,10 +4,8 @@ import { ChartLegend, ChartLabel, ChartDonut, ChartThemeColor } from '@patternfl
 import { DistributedWorkloadsContext } from '~/concepts/distributedWorkloads/DistributedWorkloadsContext';
 import { WorkloadStatusType, getStatusInfo } from '~/concepts/distributedWorkloads/utils';
 import EmptyStateErrorMessage from '~/components/EmptyStateErrorMessage';
-import {
-  LoadingState,
-  NoWorkloadState,
-} from '~/pages/distributedWorkloads/components/SharedStates';
+import { LoadingState } from '~/pages/distributedWorkloads/components/LoadingState';
+import { NoWorkloadState } from '~/pages/distributedWorkloads/components/NoWorkloadState';
 
 //TODO: next 4 utility functions to be replaced or moved into a utility class
 const memoryBytesToGibStr = (bytes: number, excludeUnit = false): string => {

diff --git a/...ages/distributedWorkloads/global/projectMetrics/sections/WorkloadResourceMetricsTable.tsx b/...ages/distributedWorkloads/global/projectMetrics/sections/WorkloadResourceMetricsTable.tsx
@@ -12,10 +12,8 @@ import {
 import { bytesAsPreciseGiB } from '~/utilities/number';
 import { WorkloadKind } from '~/k8sTypes';
 import EmptyStateErrorMessage from '~/components/EmptyStateErrorMessage';
-import {
-  LoadingState,
-  NoWorkloadState,
-} from '~/pages/distributedWorkloads/components/SharedStates';
+import { LoadingState } from '~/pages/distributedWorkloads/components/LoadingState';
+import { NoWorkloadState } from '~/pages/distributedWorkloads/components/NoWorkloadState';
 
 export const WorkloadResourceMetricsTable: React.FC = () => {
   const { workloads, projectCurrentMetrics } = React.useContext(DistributedWorkloadsContext);

diff --git a/frontend/src/pages/distributedWorkloads/global/workloadStatus/DWStatusOverviewDonutChart.tsx b/frontend/src/pages/distributedWorkloads/global/workloadStatus/DWStatusOverviewDonutChart.tsx
@@ -7,7 +7,7 @@ import {
   WorkloadStatusType,
   getStatusCounts,
 } from '~/concepts/distributedWorkloads/utils';
-import { LoadingState } from '~/pages/distributedWorkloads/components/SharedStates';
+import { LoadingState } from '~/pages/distributedWorkloads/components/LoadingState';
 
 export const DWStatusOverviewDonutChart: React.FC = () => {
   const { workloads } = React.useContext(DistributedWorkloadsContext);

diff --git a/frontend/src/pages/distributedWorkloads/global/workloadStatus/DWWorkloadsTable.tsx b/frontend/src/pages/distributedWorkloads/global/workloadStatus/DWWorkloadsTable.tsx
@@ -7,7 +7,7 @@ import { SortableData, Table } from '~/components/table';
 import { WorkloadKind } from '~/k8sTypes';
 import { getStatusInfo } from '~/concepts/distributedWorkloads/utils';
 import { WorkloadStatusLabel } from '~/pages/distributedWorkloads/components/WorkloadStatusLabel';
-import { NoWorkloadState } from '~/pages/distributedWorkloads/components/SharedStates';
+import { NoWorkloadState } from '~/pages/distributedWorkloads/components/NoWorkloadState';
 
 export const DWWorkloadsTable: React.FC = () => {
   const { workloads } = React.useContext(DistributedWorkloadsContext);