Merge pull request #15671 from logonoff/CONSOLE-4840-s2e11-booze-cruise

CONSOLE-4840: Remove `FeatureFlag/Model` and `ModelDefinition`

Author: openshift-merge-bot[bot]

frontend/packages/console-app/src/__tests__/extension-checks/features.spec.ts

@@ -12,10 +12,12 @@ table in [Console dynamic plugins README](./README.md).
 
 ## 4.21.0-prerelease.x - TBD
 
+- Deprecated `setPluginStore` function in `k8s-utils.ts`. The function is now a noop and the export
+  will be removed in a future release. ([CONSOLE-4840], [#15671])
+- Fix `popupComponent` prop type in extension `console.dashboards/overview/health/resource` ([CONSOLE-4796], [#15526])
 - 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])
-- Fix `popupComponent` prop type in extension `console.dashboards/overview/health/resource` ([CONSOLE-4796], [#15526])
 
 ## 4.20.0-prerelease.1 - 2025-08-15
 
@@ -133,6 +135,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-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
 [OCPBUGS-31355]: https://issues.redhat.com/browse/OCPBUGS-31355
@@ -191,3 +194,4 @@ 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
+[#15671]: https://github.com/openshift/console/pull/15671

frontend/packages/console-app/src/__tests__/extension-checks/models.spec.ts

@@ -3,8 +3,8 @@
 | API kind | Exposed APIs |
 | -------- | ------------ |
 | Variable (82) | [ActionServiceProvider](#actionserviceprovider), [BlueInfoCircleIcon](#blueinfocircleicon), [CamelCaseWrap](#camelcasewrap), [checkAccess](#checkaccess), [CodeEditor](#codeeditor), [consoleFetch](#consolefetch), [consoleFetchJSON](#consolefetchjson), [consoleFetchText](#consolefetchtext), [DocumentTitle](#documenttitle), [ErrorBoundaryFallbackPage](#errorboundaryfallbackpage), [ErrorStatus](#errorstatus), [GenericStatus](#genericstatus), [getAPIVersionForModel](#getapiversionformodel), [getGroupVersionKindForModel](#getgroupversionkindformodel), [getGroupVersionKindForResource](#getgroupversionkindforresource), [GreenCheckCircleIcon](#greencheckcircleicon), [HorizontalNav](#horizontalnav), [InfoStatus](#infostatus), [InventoryItem](#inventoryitem), [InventoryItemBody](#inventoryitembody), [InventoryItemLoading](#inventoryitemloading), [InventoryItemStatus](#inventoryitemstatus), [InventoryItemTitle](#inventoryitemtitle), [isAllNamespacesKey](#isallnamespaceskey), [k8sCreate](#k8screate), [k8sDelete](#k8sdelete), [k8sGet](#k8sget), [k8sList](#k8slist), [k8sListItems](#k8slistitems), [k8sPatch](#k8spatch), [k8sUpdate](#k8supdate), [ListPageBody](#listpagebody), [ListPageCreate](#listpagecreate), [ListPageCreateButton](#listpagecreatebutton), [ListPageCreateDropdown](#listpagecreatedropdown), [ListPageCreateLink](#listpagecreatelink), [ListPageHeader](#listpageheader), [NamespaceBar](#namespacebar), [Overview](#overview), [OverviewGrid](#overviewgrid), [PopoverStatus](#popoverstatus), [ProgressStatus](#progressstatus), [QueryBrowser](#querybrowser), [RedExclamationCircleIcon](#redexclamationcircleicon), [ResourceEventStream](#resourceeventstream), [ResourceIcon](#resourceicon), [ResourceLink](#resourcelink), [ResourceStatus](#resourcestatus), [ResourceYAMLEditor](#resourceyamleditor), [StatusComponent](#statuscomponent), [StatusIconAndText](#statusiconandtext), [StatusPopupItem](#statuspopupitem), [StatusPopupSection](#statuspopupsection), [SuccessStatus](#successstatus), [TableData](#tabledata), [Timestamp](#timestamp), [useAccessReview](#useaccessreview), [useActiveColumns](#useactivecolumns), [useActiveNamespace](#useactivenamespace), [useActivePerspective](#useactiveperspective), [useAnnotationsModal](#useannotationsmodal), [useDeleteModal](#usedeletemodal), [useFlag](#useflag), [useK8sModel](#usek8smodel), [useK8sModels](#usek8smodels), [useK8sWatchResource](#usek8swatchresource), [useK8sWatchResources](#usek8swatchresources), [useLabelsModal](#uselabelsmodal), [useOverlay](#useoverlay), [usePrometheusPoll](#useprometheuspoll), [useQuickStartContext](#usequickstartcontext), [useResolvedExtensions](#useresolvedextensions), [useUserSettings](#useusersettings), [YellowExclamationTriangleIcon](#yellowexclamationtriangleicon), [ListPageFilter](#listpagefilter), [PerspectiveContext](#perspectivecontext), [useAccessReviewAllowed](#useaccessreviewallowed), [useListPageFilter](#uselistpagefilter), [useModal](#usemodal), [useSafetyFirst](#usesafetyfirst), [VirtualizedTable](#virtualizedtable), [YAMLEditor](#yamleditor) |
-| TypeAlias (28) | [Alert](#alert), [Alerts](#alerts), [AlwaysOnExtension](#alwaysonextension), [ColoredIconProps](#colorediconprops), [DiscoveryResources](#discoveryresources), [ExtensionHook](#extensionhook), [ExtensionHookResult](#extensionhookresult), [ExtensionK8sGroupKindModel](#extensionk8sgroupkindmodel), [ExtensionK8sGroupModel](#extensionk8sgroupmodel), [ExtensionK8sKindVersionModel](#extensionk8skindversionmodel), [ExtensionK8sModel](#extensionk8smodel), [K8sModel](#k8smodel), [K8sVerb](#k8sverb), [MatchExpression](#matchexpression), [MatchLabels](#matchlabels), [ModalComponent](#modalcomponent), [OverlayComponent](#overlaycomponent), [PerspectiveContextType](#perspectivecontexttype), [PrometheusAlert](#prometheusalert), [PrometheusLabels](#prometheuslabels), [PrometheusRule](#prometheusrule), [PrometheusRulesResponse](#prometheusrulesresponse), [PrometheusValue](#prometheusvalue), [ResolvedExtension](#resolvedextension), [Rule](#rule), [Selector](#selector), [Silence](#silence), [K8sKind](#k8skind) |
-| Interface (1) | [ModelDefinition](#modeldefinition) |
+| TypeAlias (27) | [Alert](#alert), [Alerts](#alerts), [ColoredIconProps](#colorediconprops), [DiscoveryResources](#discoveryresources), [ExtensionHook](#extensionhook), [ExtensionHookResult](#extensionhookresult), [ExtensionK8sGroupKindModel](#extensionk8sgroupkindmodel), [ExtensionK8sGroupModel](#extensionk8sgroupmodel), [ExtensionK8sKindVersionModel](#extensionk8skindversionmodel), [ExtensionK8sModel](#extensionk8smodel), [K8sModel](#k8smodel), [K8sVerb](#k8sverb), [MatchExpression](#matchexpression), [MatchLabels](#matchlabels), [ModalComponent](#modalcomponent), [OverlayComponent](#overlaycomponent), [PerspectiveContextType](#perspectivecontexttype), [PrometheusAlert](#prometheusalert), [PrometheusLabels](#prometheuslabels), [PrometheusRule](#prometheusrule), [PrometheusRulesResponse](#prometheusrulesresponse), [PrometheusValue](#prometheusvalue), [ResolvedExtension](#resolvedextension), [Rule](#rule), [Selector](#selector), [Silence](#silence), [K8sKind](#k8skind) |
+| Interface (0) |  |
 | Enum (6) | [AlertSeverity](#alertseverity), [AlertStates](#alertstates), [Operator](#operator), [PrometheusEndpoint](#prometheusendpoint), [RuleStates](#rulestates), [SilenceStates](#silencestates) |
 
 ---
@@ -115,24 +115,6 @@ Documentation is not available, please refer to the implementation.
 
 
 
-### Source
-
-[`frontend/packages/console-dynamic-plugin-sdk/src/api/common-types.ts`](https://github.com/openshift/console/tree/main/frontend/packages/console-dynamic-plugin-sdk/src/api/common-types.ts)
-
----
-
-## `AlwaysOnExtension`
-
-### Summary 
-
-Documentation is not available, please refer to the implementation.
-
-
-
-
-
-
-
 ### Source
 
 [`frontend/packages/console-dynamic-plugin-sdk/src/api/common-types.ts`](https://github.com/openshift/console/tree/main/frontend/packages/console-dynamic-plugin-sdk/src/api/common-types.ts)
@@ -1563,24 +1545,6 @@ Documentation is not available, please refer to the implementation.
 
 ---
 
-## `ModelDefinition`
-
-### Summary 
-
-Documentation is not available, please refer to the implementation.
-
-
-
-
-
-
-
-### Source
-
-[`frontend/packages/console-dynamic-plugin-sdk/src/api/common-types.ts`](https://github.com/openshift/console/tree/main/frontend/packages/console-dynamic-plugin-sdk/src/api/common-types.ts)
-
----
-
 ## `NamespaceBar`
 
 ### Summary 

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

@@ -1,5 +1,3 @@
-import { Extension } from '../types';
-
 export type { ResolvedExtension } from '../types';
 
 // Type for extension hook
@@ -222,19 +220,6 @@ export type DiscoveryResources = {
   };
 };
 
-export type AlwaysOnExtension<P extends {} = any> = Omit<Extension<P>, 'flags'>;
-
-namespace ExtensionProperties {
-  export interface ModelDefinition {
-    /** Additional Kubernetes model definitions to register with Console. */
-    models: K8sModel[];
-  }
-}
-
-export interface ModelDefinition extends AlwaysOnExtension<ExtensionProperties.ModelDefinition> {
-  type: 'ModelDefinition';
-}
-
 export enum PrometheusEndpoint {
   LABEL = 'api/v1/label',
   QUERY = 'api/v1/query',

frontend/packages/console-dynamic-plugin-sdk/docs/api.md

@@ -7,15 +7,13 @@ import {
 import { RootState } from '@console/internal/redux';
 import { initSubscriptionService } from '@console/plugin-sdk/src/api/pluginSubscriptionService';
 import { PluginStore } from '@console/plugin-sdk/src/store';
-import { setPluginStore } from '../utils/k8s';
 import { registerPluginEntryCallback, loadAndEnablePlugin } from './plugin-loader';
 
 export const initConsolePlugins = _.once(
   (pluginStore: PluginStore, reduxStore: Store<RootState>) => {
     // Initialize dynamic plugin infrastructure
     initSubscriptionService(pluginStore, reduxStore);
     registerPluginEntryCallback(pluginStore);
-    setPluginStore(pluginStore);
 
     // Initialize webpack share scope object and start loading plugins
     initSharedScope()

frontend/packages/console-dynamic-plugin-sdk/src/api/common-types.ts

@@ -6,7 +6,6 @@ import thunk from 'redux-thunk';
 import { receivedResources } from '@console/internal/actions/k8s';
 import { ConfigMapModel, SecretModel } from '@console/internal/models';
 import { SDKReducers } from '../../../../app';
-import { setPluginStore } from '../../k8s-utils';
 import { useK8sModels } from '../useK8sModels';
 
 // Redux wrapper
@@ -26,8 +25,6 @@ const WatchModels: React.FC<{}> = () => {
   return null;
 };
 
-setPluginStore({ getExtensions: () => [] });
-
 beforeEach(() => {
   store = createStore(combineReducers(SDKReducers), {}, applyMiddleware(thunk));
   modelUpdate.mockClear();

frontend/packages/console-dynamic-plugin-sdk/src/runtime/plugin-init.ts

@@ -7,7 +7,7 @@ import { receivedResources } from '@console/internal/actions/k8s';
 import { SDKReducers } from '../../../../app';
 import { WatchK8sResource } from '../../../../extensions/console-types';
 import { k8sList, k8sGet } from '../../k8s-resource';
-import { setPluginStore, k8sWatch } from '../../k8s-utils';
+import { k8sWatch } from '../../k8s-utils';
 import { useK8sWatchResource } from '../useK8sWatchResource';
 import { PodModel, podData, podList } from './useK8sWatchResource.data';
 
@@ -43,7 +43,6 @@ const WatchResource: React.FC<{ initResource: WatchK8sResource }> = ({ initResou
 
 beforeEach(() => {
   // Init k8s redux store with just one model
-  setPluginStore({ getExtensions: () => [] });
   store = createStore(combineReducers(SDKReducers), {}, applyMiddleware(thunk));
   store.dispatch(
     receivedResources({

frontend/packages/console-dynamic-plugin-sdk/src/utils/k8s/hooks/__tests__/useK8sModels.spec.tsx

@@ -8,7 +8,7 @@ import { receivedResources } from '@console/internal/actions/k8s';
 import { SDKReducers } from '../../../../app';
 import { WatchK8sResources } from '../../../../extensions/console-types';
 import { k8sList, k8sGet } from '../../k8s-resource';
-import { setPluginStore, k8sWatch } from '../../k8s-utils';
+import { k8sWatch } from '../../k8s-utils';
 import { useK8sWatchResources } from '../useK8sWatchResources';
 import { PodModel, podData, podList } from './useK8sWatchResource.data';
 
@@ -43,7 +43,6 @@ const WatchResource: React.FC<{ initResources: WatchK8sResources<{}> }> = ({ ini
 
 beforeEach(() => {
   // Init k8s redux store with just one model
-  setPluginStore({ getExtensions: () => [] });
   store = createStore(combineReducers(SDKReducers), {}, applyMiddleware(thunk));
   store.dispatch(
     receivedResources({

frontend/packages/console-dynamic-plugin-sdk/src/utils/k8s/hooks/__tests__/useK8sWatchResource.spec.tsx

@@ -1,15 +1,8 @@
 import { Map as ImmutableMap } from 'immutable';
 import * as _ from 'lodash';
-import {
-  K8sModel,
-  MatchExpression,
-  MatchLabels,
-  ModelDefinition,
-  Selector,
-} from '../../api/common-types';
+import { K8sModel, MatchExpression, MatchLabels, Selector } from '../../api/common-types';
 import { Options } from '../../api/internal-types';
 import { QueryParams, K8sResourceKindReference } from '../../extensions/console-types';
-import { Extension } from '../../types';
 import { k8sBasePath } from './k8s';
 import { getReferenceForModel } from './k8s-ref';
 import { WSFactory, WSOptions } from './ws-factory';
@@ -178,14 +171,10 @@ export const k8sWatch = (
   return new WSFactory(path, wsOptionsUpdated as WSOptions);
 };
 
-interface PluginStore {
-  getExtensions: () => Extension[];
-}
-
-let pluginStore: PluginStore;
-
-export const setPluginStore = (store: PluginStore): void => {
-  pluginStore = store;
+/** @deprecated - This function is now a noop and will be removed in future releases. */
+export const setPluginStore = (store: any) => {
+  // eslint-disable-next-line no-void
+  void store;
 };
 
 const modelKey = (model: K8sModel): string => {
@@ -201,10 +190,6 @@ export const modelsToMap = (
   });
 };
 
-export const isModelDefinition = (e: Extension): e is ModelDefinition => {
-  return e.type === 'ModelDefinition';
-};
-
 /**
  * Contains static resource definitions for Kubernetes objects.
  * Keys are of type `group:version:Kind`, but TypeScript doesn't support regex types (https://github.com/Microsoft/TypeScript/issues/6579).
@@ -215,18 +200,6 @@ const getK8sModels = () => {
   if (!k8sModels) {
     // TODO this was migrated from console and is only used for the fallback API discovery and can likely be removed
     k8sModels = modelsToMap(_.values(staticModels));
-
-    const hasModel = (model: K8sModel) => k8sModels.has(modelKey(model));
-
-    k8sModels = k8sModels.withMutations((map) => {
-      const pluginModels = _.flatMap(
-        pluginStore
-          .getExtensions()
-          .filter(isModelDefinition)
-          .map((md) => md.properties.models),
-      );
-      map.merge(modelsToMap(pluginModels.filter((model) => !hasModel(model))));
-    });
   }
   return k8sModels;
 };