CONSOLE-4840: Topology static extension cleanup

Author: logonoff

frontend/packages/console-dynamic-plugin-sdk/CHANGELOG-core.md

@@ -18,6 +18,7 @@ table in [Console dynamic plugins README](./README.md).
 - Begin alignment of plugin SDK types with `@openshift/dynamic-plugin-sdk` ([CONSOLE-3769], [#15509])
 - Add optional `fetch` property to extension `console.dashboards/overview/health/url` ([CONSOLE-4796], [#15526])
 - Add optional `infrastructure` parameter to `PrometheusHealthHandler` type ([CONSOLE-4796], [#15526])
+- Allow `K8sResourceKind` in `TopologyDataObject`, `TopologyResourcesObject`, and `OverviewItem` types ([CONSOLE-4840], [#15699])
 
 ## 4.20.0-prerelease.1 - 2025-08-15
 
@@ -195,3 +196,4 @@ table in [Console dynamic plugins README](./README.md).
 [#15509]: https://github.com/openshift/console/pull/15509
 [#15526]: https://github.com/openshift/console/pull/15526
 [#15671]: https://github.com/openshift/console/pull/15671
+[#15699]: https://github.com/openshift/console/pull/15699

frontend/packages/console-dynamic-plugin-sdk/src/extensions/topology-types.ts

@@ -47,7 +47,7 @@ export interface OdcEdgeModel extends EdgeModel {
   resourceKind?: K8sResourceKindReference;
 }
 
-export type TopologyResourcesObject = { [key: string]: K8sResourceCommon[] };
+export type TopologyResourcesObject = { [key: string]: K8sResourceKind[] };
 
 export type TopologyDataResources = WatchK8sResults<TopologyResourcesObject>;
 
@@ -101,9 +101,9 @@ export type TopologyDisplayOption = {
   value: boolean;
 };
 
-export type OverviewItem<T = K8sResourceCommon> = {
+export type OverviewItem<T = K8sResourceKind> = {
   obj: T;
-  hpas?: K8sResourceCommon[];
+  hpas?: K8sResourceKind[];
   isOperatorBackedService?: boolean;
   isMonitorable?: boolean;
   monitoringAlerts?: PrometheusAlert[];
@@ -133,9 +133,9 @@ export interface TopologyDataObject<D = {}> {
   name: string;
   type: string;
   resources: OverviewItem;
-  pods?: K8sResourceCommon[];
+  pods?: K8sResourceKind[];
   data: D;
-  resource: K8sResourceCommon | null;
+  resource: K8sResourceKind | null;
   groupResources?: OdcNodeModel[];
 }
 

frontend/packages/knative-plugin/src/topology/knative-topology-utils.ts

@@ -9,7 +9,8 @@ import {
 } from '@patternfly/react-topology/dist/esm/types';
 import i18next from 'i18next';
 import * as _ from 'lodash';
-import { WatchK8sResultsObject } from '@console/dynamic-plugin-sdk';
+import { WatchK8sResultsObject } from '@console/dynamic-plugin-sdk/src/extensions/console-types';
+import { OverviewItem } from '@console/dynamic-plugin-sdk/src/extensions/topology-types';
 import { getImageForIconClass } from '@console/internal/components/catalog/catalog-item-icon';
 import { DeploymentModel, PodModel, ServiceModel } from '@console/internal/models';
 import {
@@ -25,7 +26,7 @@ import {
   groupVersionFor,
 } from '@console/internal/module/k8s';
 import { RootState } from '@console/internal/redux';
-import { getOwnedResources, OverviewItem } from '@console/shared';
+import { getOwnedResources } from '@console/shared';
 import { NODE_WIDTH, NODE_HEIGHT, NODE_PADDING } from '@console/topology/src/const';
 import {
   getTopologyGroupItems,

frontend/packages/knative-plugin/src/topology/topology-types.ts

@@ -1,5 +1,6 @@
+import { PodControllerOverviewItem } from '@console/dynamic-plugin-sdk/src/extensions/console-types';
+import { OverviewItem } from '@console/dynamic-plugin-sdk/src/extensions/topology-types';
 import { K8sResourceKind } from '@console/internal/module/k8s';
-import { OverviewItem, PodControllerOverviewItem } from '@console/shared/src';
 import { TopologyDataObject } from '@console/topology/src/topology-types';
 import { KnativeItem } from '../utils/get-knative-resources';
 

frontend/packages/topology/src/components/graph-view/Topology.tsx

@@ -23,11 +23,11 @@ import {
 import * as _ from 'lodash';
 import { action } from 'mobx';
 import { connect } from 'react-redux';
+import { useResolvedExtensions } from '@console/dynamic-plugin-sdk/src/api/useResolvedExtensions';
 import {
-  useResolvedExtensions,
-  isTopologyComponentFactory as isDynamicTopologyComponentFactory,
-  TopologyComponentFactory as DynamicTopologyComponentFactory,
-} from '@console/dynamic-plugin-sdk';
+  isTopologyComponentFactory,
+  TopologyComponentFactory,
+} from '@console/dynamic-plugin-sdk/src/extensions/topology';
 import { RootState } from '@console/internal/redux';
 import {
   useQueryParams,
@@ -37,7 +37,6 @@ import {
 import { withFallback, ErrorBoundaryFallbackPage } from '@console/shared/src/components/error';
 import { TOPOLOGY_LAYOUT_CONFIG_STORAGE_KEY, TOPOLOGY_LAYOUT_LOCAL_STORAGE_KEY } from '../../const';
 import { odcElementFactory } from '../../elements';
-import { isTopologyComponentFactory, TopologyComponentFactory } from '../../extensions/topology';
 import { getTopologyGraphModel, setTopologyGraphModel } from '../../redux/action';
 import { SHOW_GROUPING_HINT_EVENT, ShowGroupingHintEventListener } from '../../topology-types';
 import { componentFactory } from './components';
@@ -148,12 +147,9 @@ const Topology: React.FC<
   const storedLayoutApplied = React.useRef<boolean>(false);
   const queryParams = useQueryParams();
   const selectedId = queryParams.get('selectId');
-  const [componentFactoryExtensions, isStaticResolved] = useResolvedExtensions<
+  const [componentFactoryExtensions, extensionsResolved] = useResolvedExtensions<
     TopologyComponentFactory
   >(isTopologyComponentFactory);
-  const [dynamicComponentFactoryExtensions, isDynamicResolved] = useResolvedExtensions<
-    DynamicTopologyComponentFactory
-  >(isDynamicTopologyComponentFactory);
 
   const createVisualization = React.useCallback(() => {
     const storedLayout = topologyLayoutDataJson?.[namespace];
@@ -296,12 +292,12 @@ const Topology: React.FC<
   }, [model, visualization, visualizationReady]);
 
   React.useEffect(() => {
-    if (!isStaticResolved || !isDynamicResolved) {
+    if (!extensionsResolved) {
       return;
     }
 
     visualization.registerComponentFactory(componentFactory);
-    [...componentFactoryExtensions, ...dynamicComponentFactoryExtensions].forEach((factory) => {
+    componentFactoryExtensions.forEach((factory) => {
       visualization.registerComponentFactory(factory.properties.getFactory);
     });
 
@@ -312,13 +308,7 @@ const Topology: React.FC<
       },
     );
     setVisualizationReady(true);
-  }, [
-    visualization,
-    isStaticResolved,
-    isDynamicResolved,
-    componentFactoryExtensions,
-    dynamicComponentFactoryExtensions,
-  ]);
+  }, [visualization, extensionsResolved, componentFactoryExtensions]);
 
   React.useEffect(() => {
     if (!applicationRef.current) {

frontend/packages/topology/src/components/page/TopologyView.tsx

@@ -16,17 +16,17 @@ import {
   FileUploadContext,
 } from '@console/app/src/components/file-upload/file-upload-context';
 import { useAddToProjectAccess } from '@console/dev-console/src/utils/useAddToProjectAccess';
+import { useResolvedExtensions } from '@console/dynamic-plugin-sdk/src/api/useResolvedExtensions';
 import {
-  useResolvedExtensions,
   isTopologyCreateConnector,
-  isTopologyDecoratorProvider as isDynamicTopologyDecoratorProvider,
-  isTopologyDisplayFilters as isDynamicTopologyDisplayFilters,
+  isTopologyDecoratorProvider,
+  isTopologyDisplayFilters,
   TopologyCreateConnector,
-  TopologyDecoratorProvider as DynamicTopologyDecoratorProvider,
-  TopologyDisplayFilters as DynamicTopologyDisplayFilters,
+  TopologyDecoratorProvider,
+  TopologyDisplayFilters,
   TopologyRelationshipProvider,
   isTopologyRelationshipProvider,
-} from '@console/dynamic-plugin-sdk';
+} from '@console/dynamic-plugin-sdk/src/extensions/topology';
 import { selectOverviewDetailsTab } from '@console/internal/actions/ui';
 import {
   getQueryArgument,
@@ -40,12 +40,6 @@ import { useDeepCompareMemoize, useQueryParams } from '@console/shared';
 import { useTelemetry } from '@console/shared/src/hooks/useTelemetry';
 import { LAST_TOPOLOGY_OVERVIEW_OPEN_STORAGE_KEY } from '../../const';
 import { updateModelFromFilters } from '../../data-transforms/updateModelFromFilters';
-import {
-  isTopologyDecoratorProvider,
-  isTopologyDisplayFilters,
-  TopologyDecoratorProvider,
-  TopologyDisplayFilters,
-} from '../../extensions/topology';
 import {
   getTopologySearchQuery,
   TOPOLOGY_LABELS_FILTER_KEY,
@@ -135,24 +129,16 @@ export const ConnectedTopologyView: React.FC<ComponentProps> = ({
     [fireTelemetryEvent],
   );
   const appliedFilters = useAppliedDisplayFilters();
+
   const [displayFilterExtensions, displayFilterExtensionsResolved] = useResolvedExtensions<
     TopologyDisplayFilters
   >(isTopologyDisplayFilters);
-
-  const [extensionDecorators, extensionDecoratorsResolved] = useResolvedExtensions<
-    TopologyDecoratorProvider
-  >(isTopologyDecoratorProvider);
-
-  const [
-    dynamicDisplayFilterExtensions,
-    dynamicDisplayFilterExtensionsResolved,
-  ] = useResolvedExtensions<DynamicTopologyDisplayFilters>(isDynamicTopologyDisplayFilters);
   const [createConnectors, createConnectorsResolved] = useResolvedExtensions<
     TopologyCreateConnector
   >(isTopologyCreateConnector);
-  const [dynamicExtensionDecorators, dynamicExtensionDecoratorsResolved] = useResolvedExtensions<
-    DynamicTopologyDecoratorProvider
-  >(isDynamicTopologyDecoratorProvider);
+  const [extensionDecorators, extensionDecoratorsResolved] = useResolvedExtensions<
+    TopologyDecoratorProvider
+  >(isTopologyDecoratorProvider);
   const [relationshipProvider] = useResolvedExtensions<TopologyRelationshipProvider>(
     isTopologyRelationshipProvider,
   );
@@ -218,8 +204,8 @@ export const ConnectedTopologyView: React.FC<ComponentProps> = ({
   }, [visualization, graphData]);
 
   React.useEffect(() => {
-    if (extensionDecoratorsResolved && dynamicExtensionDecoratorsResolved) {
-      const allDecorators = [...extensionDecorators, ...dynamicExtensionDecorators].reduce(
+    if (extensionDecoratorsResolved) {
+      const allDecorators = extensionDecorators.reduce(
         (acc, extensionDecorator) => {
           const decorator: TopologyDecorator = extensionDecorator.properties;
           if (!acc[decorator.quadrant]) {
@@ -240,17 +226,12 @@ export const ConnectedTopologyView: React.FC<ComponentProps> = ({
       );
       setTopologyDecorators(allDecorators);
     }
-  }, [
-    dynamicExtensionDecorators,
-    dynamicExtensionDecoratorsResolved,
-    extensionDecorators,
-    extensionDecoratorsResolved,
-  ]);
+  }, [extensionDecorators, extensionDecoratorsResolved]);
 
   React.useEffect(() => {
-    if (displayFilterExtensionsResolved && dynamicDisplayFilterExtensionsResolved) {
+    if (displayFilterExtensionsResolved) {
       const updateFilters = [...filters];
-      [...displayFilterExtensions, ...dynamicDisplayFilterExtensions].forEach((extension) => {
+      displayFilterExtensions.forEach((extension) => {
         const extFilters = extension.properties.getTopologyFilters();
         extFilters?.forEach((filter) => {
           if (!updateFilters.find((f) => f.id === filter.id)) {
@@ -266,22 +247,15 @@ export const ConnectedTopologyView: React.FC<ComponentProps> = ({
     }
     // Only update on extension changes
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [
-    displayFilterExtensionsResolved,
-    dynamicDisplayFilterExtensionsResolved,
-    displayFilterExtensions,
-    dynamicDisplayFilterExtensions,
-  ]);
+  }, [displayFilterExtensionsResolved, displayFilterExtensions]);
 
   React.useEffect(() => {
     if (filtersLoaded) {
       const newModel = updateModelFromFilters(
         model,
         filters,
         application,
-        [...displayFilterExtensions, ...dynamicDisplayFilterExtensions].map(
-          (extension) => extension.properties.applyDisplayOptions,
-        ),
+        displayFilterExtensions.map((extension) => extension.properties.applyDisplayOptions),
         onSupportedFiltersChange,
         onSupportedKindsChange,
       );
@@ -296,7 +270,6 @@ export const ConnectedTopologyView: React.FC<ComponentProps> = ({
     onSupportedFiltersChange,
     onSupportedKindsChange,
     displayFilterExtensions,
-    dynamicDisplayFilterExtensions,
   ]);
 
   React.useEffect(() => {

frontend/packages/topology/src/data-transforms/transform-utils.ts

@@ -12,6 +12,7 @@ import {
   GetTopologyNodeItem,
   GetWorkloadResources,
   MergeGroup,
+  OverviewItem,
 } from '@console/dynamic-plugin-sdk/src/extensions/topology-types';
 import { getImageForIconClass } from '@console/internal/components/catalog/catalog-item-icon';
 import { Alerts } from '@console/internal/components/monitoring/types';
@@ -28,7 +29,7 @@ import {
   TYPE_EVENT_SOURCE_KAFKA,
   TYPE_KNATIVE_REVISION,
 } from '@console/knative-plugin/src/topology/const';
-import { isKnativeServing, OverviewItem } from '@console/shared';
+import { isKnativeServing } from '@console/shared/src/utils/pod-utils';
 import { returnIfValidURL } from '@console/shared/src/utils/utils';
 import {
   TYPE_APPLICATION_GROUP,