Remove declaration for DashboardOverviewUtilizationItem from all sdks

openshift · Jun 17, 2021 · 28fa818 · 28fa818
1 parent 6ea5f1d
commit 28fa818
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 101 deletions.
diff --git a/frontend/packages/ceph-storage-plugin/src/plugin.ts b/frontend/packages/ceph-storage-plugin/src/plugin.ts
@@ -3,7 +3,6 @@ import {
   ClusterServiceVersionAction,
   DashboardsCard,
   DashboardsOverviewHealthResourceSubsystem,
-  DashboardsOverviewUtilizationItem,
   DashboardsTab,
   HorizontalNavTab,
   ModelDefinition,
@@ -49,7 +48,6 @@ type ConsumedExtensions =
   | DashboardsTab
   | DashboardsCard
   | DashboardsOverviewHealthResourceSubsystem<WatchCephResource>
-  | DashboardsOverviewUtilizationItem
   | RoutePage
   | CustomFeatureFlag
   | ClusterServiceVersionAction

diff --git a/frontend/packages/console-app/src/__tests__/extension-checks/dashboards.spec.ts b/frontend/packages/console-app/src/__tests__/extension-checks/dashboards.spec.ts
diff --git a/frontend/packages/console-demo-plugin/src/plugin.tsx b/frontend/packages/console-demo-plugin/src/plugin.tsx
@@ -16,13 +16,11 @@ import {
   DashboardsTab,
   DashboardsOverviewInventoryItem,
   DashboardsInventoryItemGroup,
-  DashboardsOverviewUtilizationItem,
   DashboardsOverviewResourceActivity,
   DashboardsOverviewPrometheusActivity,
   HorizontalNavTab,
 } from '@console/plugin-sdk';
 import { GridPosition } from '@console/shared/src/components/dashboard/DashboardGrid';
-import { OverviewQuery } from '@console/shared/src/promql/cluster-dashboard';
 import { getFooHealthState, getBarHealthState } from './components/dashboards/health';
 import { DemoGroupIcon } from './components/dashboards/inventory';
 import TestIcon from './components/test-icon';
@@ -41,7 +39,6 @@ type ConsumedExtensions =
   | DashboardsCard
   | DashboardsOverviewInventoryItem
   | DashboardsInventoryItemGroup
-  | DashboardsOverviewUtilizationItem
   | DashboardsOverviewResourceActivity
   | DashboardsOverviewPrometheusActivity
   | HorizontalNavTab;
@@ -181,17 +178,6 @@ const plugin: Plugin<ConsumedExtensions> = [
       required: [TEST_MODEL_FLAG],
     },
   },
-  {
-    type: 'Dashboards/Overview/Utilization/Item',
-    properties: {
-      id: OverviewQuery.STORAGE_UTILIZATION,
-      query: 'barQuery',
-      totalQuery: 'fooQuery',
-    },
-    flags: {
-      required: [TEST_MODEL_FLAG],
-    },
-  },
   {
     type: 'Dashboards/Overview/Activity/Resource',
     properties: {

diff --git a/frontend/packages/console-dynamic-plugin-sdk/src/extensions/dashboards.ts b/frontend/packages/console-dynamic-plugin-sdk/src/extensions/dashboards.ts
@@ -148,19 +148,6 @@ export type DashboardsInventoryItemGroup = ExtensionDeclaration<
   }
 >;
 
-/** Adds a resource tile to the overview utilization card. */
-export type DashboardsOverviewUtilizationItem = ExtensionDeclaration<
-  'console.dashboards/overview/utilization/item',
-  {
-    /** The utilization item to be replaced */
-    id: string;
-    /** The Prometheus utilization query */
-    query: string;
-    /** The Prometheus total query */
-    totalQuery: string;
-  }
->;
-
 /** Adds a resource tile to the overview inventory card. */
 export type DashboardsOverviewInventoryItem<
   T extends K8sKind = K8sKind,
@@ -268,11 +255,6 @@ export const isResolvedDashboardsOverviewHealthOperator = (
 export const isDashboardsInventoryItemGroup = (e: Extension): e is DashboardsInventoryItemGroup =>
   e.type === 'console.dashboards/overview/inventory/item/group';
 
-export const isDashboardsOverviewUtilizationItem = (
-  e: Extension,
-): e is DashboardsOverviewUtilizationItem =>
-  e.type === 'console.dashboards/overview/utilization/item';
-
 export const isDashboardsOverviewInventoryItem = (
   e: Extension,
 ): e is DashboardsOverviewInventoryItem => e.type === 'console.dashboards/overview/inventory/item';

diff --git a/frontend/packages/console-plugin-sdk/src/typings/dashboards.ts b/frontend/packages/console-plugin-sdk/src/typings/dashboards.ts
@@ -290,15 +290,6 @@ export interface DashboardsCard extends Extension<ExtensionProperties.Dashboards
 
 export const isDashboardsCard = (e: Extension): e is DashboardsCard => e.type === 'Dashboards/Card';
 
-export interface DashboardsOverviewUtilizationItem
-  extends Extension<ExtensionProperties.DashboardsOverviewUtilizationItem> {
-  type: 'Dashboards/Overview/Utilization/Item';
-}
-
-export const isDashboardsOverviewUtilizationItem = (
-  e: Extension,
-): e is DashboardsOverviewUtilizationItem => e.type === 'Dashboards/Overview/Utilization/Item';
-
 export interface DashboardsOverviewInventoryItem
   extends Extension<ExtensionProperties.DashboardsOverviewInventoryItem> {
   type: 'Dashboards/Overview/Inventory/Item';

diff --git a/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/utilization-card.tsx b/frontend/public/components/dashboard/dashboards-page/cluster-dashboard/utilization-card.tsx
@@ -1,5 +1,4 @@
 import * as React from 'react';
-import * as _ from 'lodash-es';
 import { useTranslation } from 'react-i18next';
 import DashboardCard from '@console/shared/src/components/dashboard/dashboard-card/DashboardCard';
 import DashboardCardHeader from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardHeader';
@@ -14,16 +13,6 @@ import UtilizationItem, {
 import UtilizationBody from '@console/shared/src/components/dashboard/utilization-card/UtilizationBody';
 import ConsumerPopover from '@console/shared/src/components/dashboard/utilization-card/TopConsumerPopover';
 import { ByteDataTypes } from '@console/shared/src/graph-helper/data-utils';
-import {
-  useExtensions,
-  DashboardsOverviewUtilizationItem,
-  isDashboardsOverviewUtilizationItem,
-} from '@console/plugin-sdk';
-import {
-  useResolvedExtensions,
-  DashboardsOverviewUtilizationItem as DynamicDashboardsOverviewUtilizationItem,
-  isDashboardsOverviewUtilizationItem as isDynamicDashboardsOverviewUtilizationItem,
-} from '@console/dynamic-plugin-sdk';
 import { PopoverPosition } from '@patternfly/react-core';
 import { DashboardItemProps, withDashboardResources } from '../../with-dashboard-resources';
 import {
@@ -353,34 +342,9 @@ export const PrometheusMultilineUtilizationItem = withDashboardResources<
   },
 );
 
-const getQueries = (itemExtensions: DashboardsOverviewUtilizationItem['properties'][]) => {
-  const pluginQueries = {};
-  itemExtensions.forEach((e) => {
-    if (!pluginQueries[e.id]) {
-      pluginQueries[e.id] = {
-        utilization: e.query,
-        total: e.totalQuery,
-      };
-    }
-  });
-  return _.defaults(pluginQueries, utilizationQueries);
-};
-
 export const UtilizationCard = () => {
   const { t } = useTranslation();
 
-  const itemExtensions = useExtensions<DashboardsOverviewUtilizationItem>(
-    isDashboardsOverviewUtilizationItem,
-  );
-  const [dynamicItemExtensions] = useResolvedExtensions<DynamicDashboardsOverviewUtilizationItem>(
-    isDynamicDashboardsOverviewUtilizationItem,
-  );
-
-  const queries = React.useMemo(
-    () => getQueries([...itemExtensions, ...dynamicItemExtensions].map((e) => e.properties)),
-    [itemExtensions, dynamicItemExtensions],
-  );
-
   const [timestamps, setTimestamps] = React.useState<Date[]>();
   const [duration, setDuration] = useMetricDuration(t);
 
@@ -476,28 +440,28 @@ export const UtilizationCard = () => {
       <UtilizationBody timestamps={timestamps}>
         <PrometheusUtilizationItem
           title={t('public~CPU')}
-          utilizationQuery={queries[OverviewQuery.CPU_UTILIZATION].utilization}
-          totalQuery={queries[OverviewQuery.CPU_UTILIZATION].total}
-          requestQuery={queries[OverviewQuery.CPU_UTILIZATION].requests}
+          utilizationQuery={utilizationQueries[OverviewQuery.CPU_UTILIZATION].utilization}
+          totalQuery={utilizationQueries[OverviewQuery.CPU_UTILIZATION].total}
+          requestQuery={utilizationQueries[OverviewQuery.CPU_UTILIZATION].requests}
           TopConsumerPopover={cpuPopover}
           duration={duration}
           humanizeValue={humanizeCpuCores}
           setTimestamps={setTimestamps}
         />
         <PrometheusUtilizationItem
           title={t('public~Memory')}
-          utilizationQuery={queries[OverviewQuery.MEMORY_UTILIZATION].utilization}
-          totalQuery={queries[OverviewQuery.MEMORY_UTILIZATION].total}
-          requestQuery={queries[OverviewQuery.MEMORY_UTILIZATION].requests}
+          utilizationQuery={utilizationQueries[OverviewQuery.MEMORY_UTILIZATION].utilization}
+          totalQuery={utilizationQueries[OverviewQuery.MEMORY_UTILIZATION].total}
+          requestQuery={utilizationQueries[OverviewQuery.MEMORY_UTILIZATION].requests}
           TopConsumerPopover={memPopover}
           duration={duration}
           humanizeValue={humanizeBinaryBytes}
           byteDataType={ByteDataTypes.BinaryBytes}
         />
         <PrometheusUtilizationItem
           title={t('public~Filesystem')}
-          utilizationQuery={queries[OverviewQuery.STORAGE_UTILIZATION].utilization}
-          totalQuery={queries[OverviewQuery.STORAGE_UTILIZATION].total}
+          utilizationQuery={utilizationQueries[OverviewQuery.STORAGE_UTILIZATION].utilization}
+          totalQuery={utilizationQueries[OverviewQuery.STORAGE_UTILIZATION].total}
           TopConsumerPopover={storagePopover}
           duration={duration}
           humanizeValue={humanizeBinaryBytes}
@@ -512,7 +476,7 @@ export const UtilizationCard = () => {
         />
         <PrometheusUtilizationItem
           title={t('public~Pod count')}
-          utilizationQuery={queries[OverviewQuery.POD_UTILIZATION].utilization}
+          utilizationQuery={utilizationQueries[OverviewQuery.POD_UTILIZATION].utilization}
           TopConsumerPopover={podPopover}
           duration={duration}
           humanizeValue={humanizeNumber}