Merge pull request #7207 from jeff-phillips-18/overview-item

Cleanup OverviewItem removing unnecessary fields, retrieve data as necessary
openshift · Nov 18, 2020 · d70027e · d70027e
2 parents 9f0c26e + a8048a6
commit d70027e
Show file tree

Hide file tree

Showing 69 changed files with 4,201 additions and 4,460 deletions.
diff --git a/frontend/packages/console-app/src/actions/__tests__/modify-health-checks.spec.ts b/frontend/packages/console-app/src/actions/__tests__/modify-health-checks.spec.ts
@@ -1,4 +1,4 @@
-import { sampleDeployments } from '@console/dev-console/src/components/topology/__tests__/topology-test-data';
+import { sampleDeployments } from '@console/shared/src/utils/__tests__/test-resource-data';
 import { AddHealthChecks, EditHealthChecks } from '../modify-health-checks';
 import { DeploymentModel } from '@console/internal/models';
 

diff --git a/...packages/console-shared/src/components/health-checks/__tests__/HealthChecksAlert.spec.tsx b/...packages/console-shared/src/components/health-checks/__tests__/HealthChecksAlert.spec.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { shallow } from 'enzyme';
 import { Alert } from '@patternfly/react-core';
 import * as utils from '@console/internal/components/utils';
-import { sampleDeployments } from '@console/dev-console/src/components/topology/__tests__/topology-test-data';
+import { sampleDeployments } from '@console/shared/src/utils/__tests__/test-resource-data';
 import HealthChecksAlert from '../HealthChecksAlert';
 
 jest.mock('react-i18next', () => {

diff --git a/frontend/packages/console-shared/src/components/pod/PodRingSet.tsx b/frontend/packages/console-shared/src/components/pod/PodRingSet.tsx
@@ -20,7 +20,7 @@ const PodRingSet: React.FC<PodRingSetProps> = ({ obj, path }) => {
 
   const deploymentData = React.useMemo(() => {
     return loaded && !loadError
-      ? getPodData(obj, podData.pods, podData.current, podData.previous, podData.isRollingOut)
+      ? getPodData({ ...podData, obj })
       : { inProgressDeploymentData: null, completedDeploymentData: null };
   }, [loadError, loaded, podData, obj]);
 

diff --git a/frontend/packages/console-shared/src/components/pod/__tests__/PodRingSet.spec.tsx b/frontend/packages/console-shared/src/components/pod/__tests__/PodRingSet.spec.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { shallow } from 'enzyme';
 import { PodKind } from '@console/internal/module/k8s';
-import { samplePods } from '@console/dev-console/src/components/topology/__tests__/topology-test-data';
+import { samplePods } from '@console/shared/src/utils/__tests__/test-resource-data';
 import { LongArrowAltRightIcon } from '@patternfly/react-icons';
 import PodRingSet from '../PodRingSet';
 import { PodRCData } from '../../../types';

diff --git a/frontend/packages/console-shared/src/hooks/__tests__/usePluginsOverviewTabSection.spec.ts b/frontend/packages/console-shared/src/hooks/__tests__/usePluginsOverviewTabSection.spec.ts
@@ -1,13 +1,10 @@
 import * as React from 'react';
 import { Button } from '@patternfly/react-core';
 import { useExtensions, OverviewTabSection, LazyLoader } from '@console/plugin-sdk';
-import {
-  knativeServiceObj,
-  sampleKnativeRevisions,
-} from '@console/knative-plugin/src/topology/__tests__/topology-knative-test-data';
 import { OverviewItem } from '../../types/resource';
 import { testHook } from '../../../../../__tests__/utils/hooks-utils';
 import { usePluginsOverviewTabSection } from '../plugins-overview-tab-section';
+import { sampleDeploymentConfigs } from '../../utils/__tests__/test-resource-data';
 
 jest.mock('@console/plugin-sdk/src/api/useExtensions', () => ({
   useExtensions: jest.fn(),
@@ -16,8 +13,9 @@ describe('usePluginsOverviewTabSection', () => {
   let item: OverviewItem;
   beforeEach(() => {
     item = {
-      revisions: sampleKnativeRevisions.data,
-      obj: knativeServiceObj,
+      obj: sampleDeploymentConfigs.data[0],
+      deploymentConfigs: sampleDeploymentConfigs,
+      isMonitorable: true,
     } as OverviewItem;
   });
 
@@ -35,7 +33,7 @@ describe('usePluginsOverviewTabSection', () => {
     const tabSection: OverviewTabSection = {
       type: 'Overview/Section',
       properties: {
-        key: 'revisions',
+        key: 'deploymentConfigs',
         loader,
       },
     };

diff --git a/frontend/packages/console-shared/src/types/resource.ts b/frontend/packages/console-shared/src/types/resource.ts
@@ -1,11 +1,5 @@
-import {
-  HorizontalPodAutoscalerKind,
-  K8sResourceKind,
-  PodKind,
-} from '@console/internal/module/k8s';
+import { HorizontalPodAutoscalerKind, K8sResourceKind } from '@console/internal/module/k8s';
 import { DEPLOYMENT_STRATEGY } from '../constants';
-import { PodControllerOverviewItem } from './pod';
-import { ClusterServiceVersionKind } from '@console/operator-lifecycle-manager';
 import { Alert } from '@console/internal/components/monitoring/types';
 
 export type APIError = {
@@ -24,25 +18,11 @@ export type BuildConfigOverviewItem = K8sResourceKind & {
 };
 
 export type OverviewItem<T = K8sResourceKind> = {
-  current?: PodControllerOverviewItem;
-  isRollingOut?: boolean;
   obj: T;
   hpas?: HorizontalPodAutoscalerKind[];
-  pods?: PodKind[];
-  previous?: PodControllerOverviewItem;
-  status?: React.ReactNode;
-  ksroutes?: K8sResourceKind[];
-  configurations?: K8sResourceKind[];
-  ksservices?: K8sResourceKind[];
-  eventSources?: K8sResourceKind[];
-  revisions?: K8sResourceKind[];
   isOperatorBackedService?: boolean;
   isMonitorable?: boolean;
   monitoringAlerts?: Alert[];
 };
 
-export type OperatorBackedServiceKindMap = {
-  [name: string]: ClusterServiceVersionKind;
-};
-
 export type DeploymentStrategy = DEPLOYMENT_STRATEGY.recreate | DEPLOYMENT_STRATEGY.rolling;
diff --git a/frontend/packages/console-shared/src/utils/ResourceStatus.tsx b/frontend/packages/console-shared/src/utils/ResourceStatus.tsx
diff --git a/frontend/packages/console-shared/src/utils/__tests__/pod-resource-utils.spec.ts b/frontend/packages/console-shared/src/utils/__tests__/pod-resource-utils.spec.ts
@@ -1,12 +1,12 @@
 import * as _ from 'lodash';
 import {
-  MockResources,
   sampleCronJobs,
   sampleDaemonSets,
   sampleDeploymentConfigs,
   sampleDeployments,
   sampleStatefulSets,
-} from '@console/dev-console/src/components/topology/__tests__/topology-test-data';
+  MockResources,
+} from '@console/shared/src/utils/__tests__/test-resource-data';
 import {
   getPodsForDeploymentConfig,
   getPodsForDeployment,

diff --git a/frontend/packages/console-shared/src/utils/__tests__/pod-utils.spec.ts b/frontend/packages/console-shared/src/utils/__tests__/pod-utils.spec.ts
@@ -65,7 +65,9 @@ describe('Pod Utils:', () => {
   it('should return pods if there are no rolling strategy', () => {
     const current: PodControllerOverviewItem = { pods: [], alerts: {}, revision: 0, obj: {} };
     const previous: PodControllerOverviewItem = { pods: [], alerts: {}, revision: 0, obj: {} };
-    expect(getPodData(statefulSets, allpods, current, previous, false)).toEqual({
+    expect(
+      getPodData({ obj: statefulSets, pods: allpods, current, previous, isRollingOut: false }),
+    ).toEqual({
       inProgressDeploymentData: null,
       completedDeploymentData: allpods,
     });
@@ -80,7 +82,9 @@ describe('Pod Utils:', () => {
       phase: 'Complete',
     };
     const previous: PodControllerOverviewItem = { pods: allpods, alerts: {}, revision: 0, obj: {} };
-    expect(getPodData(deploymentConfig, allpods, current, previous, false)).toEqual({
+    expect(
+      getPodData({ obj: deploymentConfig, pods: allpods, current, previous, isRollingOut: false }),
+    ).toEqual({
       inProgressDeploymentData: null,
       completedDeploymentData: [],
     });
@@ -94,7 +98,9 @@ describe('Pod Utils:', () => {
       obj: {},
     };
     const previous: PodControllerOverviewItem = { pods: allpods, alerts: {}, revision: 0, obj: {} };
-    expect(getPodData(deploymentConfig, allpods, current, previous, true)).toEqual({
+    expect(
+      getPodData({ obj: deploymentConfig, pods: allpods, current, previous, isRollingOut: true }),
+    ).toEqual({
       inProgressDeploymentData: [],
       completedDeploymentData: allpods,
     });