Merge pull request #15717 from logonoff/CONSOLE-4840-s2e18-take-your-daughter-to-work-day

CONSOLE-4840: Remove static extensions used by metal3

Author: openshift-merge-bot[bot]

frontend/packages/console-plugin-sdk/src/typings/dashboards.ts

@@ -1,5 +1 @@
 export * from './base';
-
-// specific extension types
-export * from './dashboards';
-export * from './features';

frontend/packages/console-plugin-sdk/src/typings/features.ts

@@ -12,15 +12,14 @@ import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom-v5-compat';
 import {
   useResolvedExtensions,
-  DashboardsInventoryItemGroup as DynamicDashboardsInventoryItemGroup,
-  isDashboardsInventoryItemGroup as isDynamicDashboardsInventoryItemGroup,
+  DashboardsInventoryItemGroup,
+  isDashboardsInventoryItemGroup,
 } from '@console/dynamic-plugin-sdk';
+import type { ResolvedExtension } from '@console/dynamic-plugin-sdk/dist/core/lib/types';
 import { ResourceInventoryItemProps } from '@console/dynamic-plugin-sdk/src/api/internal-types';
 import { pluralize } from '@console/internal/components/utils/details-page';
 import { resourcePathFromModel } from '@console/internal/components/utils/resource-link';
 import { K8sResourceKind, K8sKind, K8sResourceCommon } from '@console/internal/module/k8s';
-import { DashboardsInventoryItemGroup, isDashboardsInventoryItemGroup } from '@console/plugin-sdk';
-import { useExtensions } from '@console/plugin-sdk/src/api/useExtensions';
 import { RedExclamationCircleIcon, YellowExclamationTriangleIcon } from '../../status/icons';
 import InventoryItemNew, {
   InventoryItemStatus,
@@ -41,7 +40,9 @@ const defaultStatusGroupIcons = {
   ),
 };
 
-const getStatusGroupIcons = (groups: DashboardsInventoryItemGroup['properties'][]) => {
+const getStatusGroupIcons = (
+  groups: ResolvedExtension<DashboardsInventoryItemGroup>['properties'][],
+) => {
   const groupStatusIcons = { ...defaultStatusGroupIcons };
   groups.forEach((group) => {
     if (!groupStatusIcons[group.id]) {
@@ -52,7 +53,7 @@ const getStatusGroupIcons = (groups: DashboardsInventoryItemGroup['properties'][
 };
 
 const getTop3Groups = (
-  groups: DashboardsInventoryItemGroup['properties'][],
+  groups: ResolvedExtension<DashboardsInventoryItemGroup>['properties'][],
   groupIDs: string[],
 ) => {
   const groupStatuses: (InventoryStatusGroup | string)[] = [
@@ -139,19 +140,14 @@ export const InventoryItem: React.FC<InventoryItemProps> = React.memo(
 );
 
 export const Status: React.FC<StatusProps> = ({ groupID, count }) => {
-  const groupExtensions = useExtensions<DashboardsInventoryItemGroup>(
+  const [groupExtensions] = useResolvedExtensions<DashboardsInventoryItemGroup>(
     isDashboardsInventoryItemGroup,
   );
-  const [dynamicGroupExtensions] = useResolvedExtensions<DynamicDashboardsInventoryItemGroup>(
-    isDynamicDashboardsInventoryItemGroup,
-  );
 
   const statusGroupIcons = React.useMemo(() => {
-    const mergedExtensions = [...groupExtensions, ...dynamicGroupExtensions].map(
-      (e) => e.properties,
-    );
-    return getStatusGroupIcons(mergedExtensions);
-  }, [dynamicGroupExtensions, groupExtensions]);
+    const extensions = groupExtensions.map((e) => e.properties);
+    return getStatusGroupIcons(extensions);
+  }, [groupExtensions]);
 
   if (groupID === InventoryStatusGroup.NOT_MAPPED || !count) {
     return null;
@@ -171,20 +167,14 @@ const StatusLink: React.FC<StatusLinkProps> = ({
   filterType,
   basePath,
 }) => {
-  const groupExtensions = useExtensions<DashboardsInventoryItemGroup>(
+  const [groupExtensions] = useResolvedExtensions<DashboardsInventoryItemGroup>(
     isDashboardsInventoryItemGroup,
   );
 
-  const [dynamicGroupExtensions] = useResolvedExtensions<DynamicDashboardsInventoryItemGroup>(
-    isDynamicDashboardsInventoryItemGroup,
-  );
-
   const statusGroupIcons = React.useMemo(() => {
-    const mergedExtensions = [...groupExtensions, ...dynamicGroupExtensions].map(
-      (e) => e.properties,
-    );
-    return getStatusGroupIcons(mergedExtensions);
-  }, [dynamicGroupExtensions, groupExtensions]);
+    const extensions = groupExtensions.map((e) => e.properties);
+    return getStatusGroupIcons(extensions);
+  }, [groupExtensions]);
 
   if (groupID === InventoryStatusGroup.NOT_MAPPED || !count) {
     return null;
@@ -243,12 +233,9 @@ export const ResourceInventoryItem: React.FC<ResourceInventoryItemProps> = ({
 
   if (TitleComponent) Title = TitleComponent;
 
-  const groupExtensions = useExtensions<DashboardsInventoryItemGroup>(
+  const [groupExtensions] = useResolvedExtensions<DashboardsInventoryItemGroup>(
     isDashboardsInventoryItemGroup,
   );
-  const [dynamicGroupExtensions] = useResolvedExtensions<DynamicDashboardsInventoryItemGroup>(
-    isDynamicDashboardsInventoryItemGroup,
-  );
 
   const groups = React.useMemo(() => (mapper ? mapper(resources, additionalResources) : {}), [
     mapper,
@@ -257,14 +244,12 @@ export const ResourceInventoryItem: React.FC<ResourceInventoryItemProps> = ({
   ]);
 
   const top3Groups = React.useMemo(() => {
-    const mergedExtensions = [...groupExtensions, ...dynamicGroupExtensions].map(
-      (e) => e.properties,
-    );
+    const extensions = groupExtensions.map((e) => e.properties);
     return getTop3Groups(
-      mergedExtensions,
+      extensions,
       Object.keys(groups).filter((key) => groups[key].count > 0),
     );
-  }, [dynamicGroupExtensions, groupExtensions, groups]);
+  }, [groupExtensions, groups]);
 
   // The count can depend on additionalResources (like mixing of VM and VMI for kubevirt-plugin)
   const totalCount = React.useMemo(

frontend/packages/console-plugin-sdk/src/typings/index.ts

@@ -3,7 +3,6 @@ import * as _ from 'lodash-es';
 
 import { FLAGS } from '@console/shared/src/constants/common';
 import { K8sModel, UserInfo } from '@console/internal/module/k8s';
-import { isCustomFeatureFlag, CustomFeatureFlag } from '@console/plugin-sdk/src/typings';
 import {
   subscribeToExtensions,
   extensionDiffListener,
@@ -129,12 +128,6 @@ const ssarCheckActions = ssarChecks.map(({ flag, resourceAttributes, after }) =>
 });
 
 export const detectFeatures = () => (dispatch: Dispatch) => {
-  subscribeToExtensions<CustomFeatureFlag>(
-    extensionDiffListener((added) =>
-      added.forEach((detector) => detector.properties.detect(dispatch)),
-    ),
-    isCustomFeatureFlag,
-  );
   [
     detectOpenShift,
     detectCanCreateProject,

frontend/packages/console-shared/src/components/dashboard/inventory-card/InventoryItem.tsx

@@ -14,18 +14,12 @@ import ActivityBody, {
   RecentEventsBody,
   OngoingActivityBody,
 } from '@console/shared/src/components/dashboard/activity-card/ActivityBody';
-import { useExtensions } from '@console/plugin-sdk/src/api/useExtensions';
-import {
-  DashboardsOverviewResourceActivity,
-  isDashboardsOverviewResourceActivity,
-} from '@console/plugin-sdk';
 import {
   useResolvedExtensions,
-  DashboardsOverviewResourceActivity as DynamicDashboardsOverviewResourceActivity,
+  DashboardsOverviewResourceActivity,
   DashboardsOverviewPrometheusActivity,
-  isDashboardsOverviewResourceActivity as isDynamicDashboardsOverviewResourceActivity,
+  isDashboardsOverviewResourceActivity,
   isDashboardsOverviewPrometheusActivity,
-  ResolvedExtension,
 } from '@console/dynamic-plugin-sdk';
 import { uniqueResource } from './utils';
 import { PrometheusResponse } from '../../../graphs';
@@ -65,19 +59,13 @@ const OngoingActivity = connect(mapStateToProps)(
       prometheusResults,
       models,
     }: DashboardItemProps & OngoingActivityProps) => {
-      const resourceActivityExtensions = useExtensions<DashboardsOverviewResourceActivity>(
-        isDashboardsOverviewResourceActivity,
-      );
-      const [dynamicResourceActivityExtensions] = useResolvedExtensions<
-        DynamicDashboardsOverviewResourceActivity
-      >(isDynamicDashboardsOverviewResourceActivity);
+      const [resourceActivityExtensions] = useResolvedExtensions<
+        DashboardsOverviewResourceActivity
+      >(isDashboardsOverviewResourceActivity);
 
       const resourceActivities = React.useMemo(
-        () =>
-          [...resourceActivityExtensions, ...dynamicResourceActivityExtensions].filter(
-            (e) => !!models.get(e.properties.k8sResource.kind),
-          ),
-        [dynamicResourceActivityExtensions, models, resourceActivityExtensions],
+        () => resourceActivityExtensions.filter((e) => !!models.get(e.properties.k8sResource.kind)),
+        [resourceActivityExtensions, models],
       );
 
       const [prometheusActivities] = useResolvedExtensions<DashboardsOverviewPrometheusActivity>(
@@ -122,9 +110,7 @@ const OngoingActivity = connect(mapStateToProps)(
                 .map((r) => ({
                   resource: r,
                   timestamp: a.properties.getTimestamp ? a.properties.getTimestamp(r) : null,
-                  loader: (a as DashboardsOverviewResourceActivity)?.properties?.loader,
-                  component: (a as ResolvedExtension<DynamicDashboardsOverviewResourceActivity>)
-                    ?.properties?.component,
+                  component: a.properties.component,
                 }));
             }),
           ),