CONSOLE-4840: Type improvements to DataModelProvider

Author: logonoff

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

@@ -19,6 +19,7 @@ table in [Console dynamic plugins README](./README.md).
 - 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])
+- Allow async functions for the `resources` property of `console.topology/data/factory` extension ([CONSOLE-4806], [#15641])
 
 ## 4.20.0-prerelease.1 - 2025-08-15
 
@@ -136,6 +137,7 @@ table in [Console dynamic plugins README](./README.md).
 [CONSOLE-4654]: https://issues.redhat.com/browse/CONSOLE-4654
 [CONSOLE-4656]: https://issues.redhat.com/browse/CONSOLE-4656
 [CONSOLE-4796]: https://issues.redhat.com/browse/CONSOLE-4796
+[CONSOLE-4806]: https://issues.redhat.com/browse/CONSOLE-4806
 [CONSOLE-4840]: https://issues.redhat.com/browse/CONSOLE-4840
 [OCPBUGS-19048]: https://issues.redhat.com/browse/OCPBUGS-19048
 [OCPBUGS-30077]: https://issues.redhat.com/browse/OCPBUGS-30077
@@ -195,5 +197,6 @@ table in [Console dynamic plugins README](./README.md).
 [#15386]: https://github.com/openshift/console/pull/15386
 [#15509]: https://github.com/openshift/console/pull/15509
 [#15526]: https://github.com/openshift/console/pull/15526
+[#15641]: https://github.com/openshift/console/pull/15699
 [#15671]: https://github.com/openshift/console/pull/15671
 [#15699]: https://github.com/openshift/console/pull/15699

frontend/packages/topology/src/data-transforms/DataModelProvider.tsx

@@ -1,8 +1,10 @@
-import * as React from 'react';
+import { FC, useEffect, useState } from 'react';
 import {
-  isTopologyDataModelFactory as isDynamicTopologyDataModelFactory,
-  TopologyDataModelFactory as DynamicTopologyDataModelFactory,
+  isTopologyDataModelFactory,
+  ResolvedExtension,
+  TopologyDataModelFactory,
   useResolvedExtensions,
+  WatchK8sResourcesGeneric,
 } from '@console/dynamic-plugin-sdk';
 import DataModelExtension from './DataModelExtension';
 import { ModelContext, ExtensibleModel } from './ModelContext';
@@ -13,43 +15,45 @@ interface DataModelProviderProps {
   children?: React.ReactNode;
 }
 
-const DataModelProvider: React.FC<DataModelProviderProps> = ({ namespace, children }) => {
-  const [model, setModel] = React.useState<ExtensibleModel>(new ExtensibleModel(namespace));
+const DataModelProvider: FC<DataModelProviderProps> = ({ namespace, children }) => {
+  const [model, setModel] = useState<ExtensibleModel>(new ExtensibleModel(namespace));
 
-  React.useEffect(() => {
+  useEffect(() => {
     setModel(new ExtensibleModel(namespace));
   }, [namespace]);
 
   // Use useResolvedExtensions to automatically resolve all CodeRefs in the extensions
-  const [dynamicModelFactories, dynamicResolved] = useResolvedExtensions<
-    DynamicTopologyDataModelFactory
-  >(isDynamicTopologyDataModelFactory);
+  const [modelFactories, factoriesResolved] = useResolvedExtensions<TopologyDataModelFactory>(
+    isTopologyDataModelFactory,
+  );
 
   // State to track resolved factories (with async resources resolved)
-  const [resolvedFactories, setResolvedFactories] = React.useState<
+  const [resolvedFactories, setResolvedFactories] = useState<
     | {
-        properties: any;
+        properties: ResolvedExtension<TopologyDataModelFactory>['properties'] & {
+          resources?: WatchK8sResourcesGeneric;
+        };
         pluginID: string;
       }[]
     | null
   >(null);
 
   // Resolve any async resources from factories
-  React.useEffect(() => {
-    if (!dynamicResolved || !dynamicModelFactories) {
+  useEffect(() => {
+    if (!modelFactories || !factoriesResolved) {
       setResolvedFactories(null);
       return;
     }
 
     const resolveFactories = async () => {
       const resolved = await Promise.all(
-        dynamicModelFactories.map(async (factory) => {
+        modelFactories.map(async (factory) => {
           const { resources, ...rest } = factory.properties;
 
           // Check if resources is a function (CodeRef that returns Promise)
           if (typeof resources === 'function') {
             try {
-              const resolvedResources = await resources();
+              const resolvedResources: WatchK8sResourcesGeneric = await resources();
               return {
                 properties: { ...rest, resources: resolvedResources },
                 pluginID: factory.pluginID,
@@ -76,7 +80,7 @@ const DataModelProvider: React.FC<DataModelProviderProps> = ({ namespace, childr
     };
 
     resolveFactories();
-  }, [dynamicModelFactories, dynamicResolved]);
+  }, [modelFactories, factoriesResolved]);
 
   return (
     <ModelContext.Provider value={model}>