CONSOLE-5093: Remove support for deprecated extensions

dynamic-demo-plugin/console-extensions.json

@@ -378,12 +378,6 @@
       "component": { "$codeRef": "dashboardCard.default" }
     }
   },
-  {
-    "type": "console.dashboards/overview/detail/item",
-    "properties": {
-      "component": { "$codeRef": "overviewDetailItem.default" }
-    }
-  },
   {
     "type": "console.dashboards/custom/overview/detail/item",
     "properties": {

dynamic-demo-plugin/locales/en/plugin__console-demo-plugin.json

@@ -67,9 +67,6 @@
   "Launch overlay modal": "Launch overlay modal",
   "Hello {{planet}}! I am Thor!": "Hello {{planet}}! I am Thor!",
   "Hello {{planet}}! I am Loki!": "Hello {{planet}}! I am Loki!",
-  "Added title": "Added title",
-  "My value": "My value",
-  "Added title - error": "Added title - error",
   "{{count}} Cron Job": "{{count}} Cron Job",
   "{{count}} Cron Job_plural": "{{count}} Cron Jobs",
   "Cron Jobs": "Cron Jobs",

dynamic-demo-plugin/package.json

@@ -66,7 +66,6 @@
       "listPage": "./components/ListPage.tsx",
       "modalPage": "./components/Modals/ModalPage.tsx",
       "navPage": "./components/Nav.tsx",
-      "overviewDetailItem": "./components/OverviewDetailItem.tsx",
       "perspective": "./utils/perspective.ts",
       "projectOverview": "./utils/project-overview.ts",
       "projectOverviewInventory": "./components/ProjectOverview/Inventory.tsx",

frontend/packages/console-app/console-extensions.json

@@ -216,14 +216,16 @@
     }
   },
   {
-    "type": "console.page/resource/tab",
+    "type": "console.tab/horizontalNav",
     "properties": {
-      "href": "volumesnapshots",
       "model": {
         "version": "v1",
         "kind": "PersistentVolumeClaim"
       },
-      "name": "%console-app~VolumeSnapshots%",
+      "page": {
+        "name": "%console-app~VolumeSnapshots%",
+        "href": "volumesnapshots"
+      },
       "component": { "$codeRef": "volumeSnapshotPage.VolumeSnapshotPVCPage" }
     }
   },
@@ -2352,15 +2354,17 @@
     }
   },
   {
-    "type": "console.page/resource/tab",
+    "type": "console.tab/horizontalNav",
     "properties": {
-      "href": "plugin-manifest",
       "model": {
         "group": "console.openshift.io",
         "version": "v1",
         "kind": "ConsolePlugin"
       },
-      "name": "%console-app~Plugin manifest%",
+      "page": {
+        "name": "%console-app~Plugin manifest%",
+        "href": "plugin-manifest"
+      },
       "component": { "$codeRef": "ConsolePluginManifestPage.ConsolePluginManifestPage" }
     }
   },

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

@@ -12,6 +12,9 @@ table in [Console dynamic plugins README](./README.md).
 
 ## 4.22.0-prerelease.2 - TBD
 
+- **Breaking**: Removed support for `console.page/resource/tab` and `console.dashboards/overview/detail/item`
+  extensions. Use `console.tab/horizontalNav` and `console.dashboards/custom/overview/detail/item` extensions
+  instead ([CONSOLE-5093], [#16043])
 - **Breaking**: Removed `pluginID` from the result in `useResolvedExtensions` hook ([CONSOLE-3769], [#15904])
 - The following types are now re-exported from `@openshift/dynamic-plugin-sdk` instead of being defined
   by Console: `CodeRef`, `EncodedCodeRef`, `LoadedExtension`, and `ResolvedExtension` ([CONSOLE-3769], [#15904])
@@ -180,6 +183,7 @@ table in [Console dynamic plugins README](./README.md).
 [CONSOLE-4840]: https://issues.redhat.com/browse/CONSOLE-4840
 [CONSOLE-5039]: https://issues.redhat.com/browse/CONSOLE-5039
 [CONSOLE-5050]: https://issues.redhat.com/browse/CONSOLE-5050
+[CONSOLE-5093]: https://issues.redhat.com/browse/CONSOLE-5093
 [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
@@ -250,3 +254,4 @@ table in [Console dynamic plugins README](./README.md).
 [#15893]: https://github.com/openshift/console/pull/15893
 [#15904]: https://github.com/openshift/console/pull/15904
 [#15934]: https://github.com/openshift/console/pull/15934
+[#16043]: https://github.com/openshift/console/pull/16043

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

@@ -78,8 +78,6 @@
 76.  [dev-console.add/action](#dev-consoleaddaction)
 77.  [dev-console.add/action-group](#dev-consoleaddaction-group)
 78.  [dev-console.import/environment](#dev-consoleimportenvironment)
-79. [DEPRECATED] [console.dashboards/overview/detail/item](#consoledashboardsoverviewdetailitem)
-80. [DEPRECATED] [console.page/resource/tab](#consolepageresourcetab)
 
 ---
 
@@ -1387,35 +1385,3 @@ This extension can be used to specify extra build environment variable fields un
 | `imageStreamTags` | `string[]` | no | List of supported image stream tags |
 | `environments` | `ImageEnvironment[]` | no | List of environment variables |
 
----
-
-## `console.dashboards/overview/detail/item`
-
-### Summary [DEPRECATED]
-
-@deprecated use CustomOverviewDetailItem type instead
-
-### Properties
-
-| Name | Value Type | Optional | Description |
-| ---- | ---------- | -------- | ----------- |
-| `component` | `CodeRef<ComponentType>` | no | The value, based on the DetailItem component |
-
----
-
-## `console.page/resource/tab`
-
-### Summary [DEPRECATED]
-
-@deprecated - Use `console.tab/horizontalNav` instead<br/>Adds new resource tab page to Console router.
-
-### Properties
-
-| Name | Value Type | Optional | Description |
-| ---- | ---------- | -------- | ----------- |
-| `model` | `ExtensionK8sGroupKindModel` | no | The model for which this resource page links to. |
-| `component` | `CodeRef<React.ComponentType<{}>>` | no | The component to be rendered when the route matches. |
-| `name` | `string` | no | The name of the tab. |
-| `href` | `string` | yes | The optional href for the tab link. If not provided, the first `path` is used. |
-| `exact` | `boolean` | yes | When true, will only match if the path matches the `location.pathname` exactly. |
-

frontend/packages/console-dynamic-plugin-sdk/release-notes/4.22.md

@@ -14,6 +14,58 @@ Additional updates to these shared modules might occur before the 4.22 release i
 - Added `@openshift/dynamic-plugin-sdk` to shared modules. Plugins must only use `@openshift-console/dynamic-plugin-sdk`
   to remain compatible with Console.
 
+## Removal of deprecated extensions
+
+Two long-deprecated extensions have been removed from Console.
+
+### Removal of `console.page/resource/tab` extension
+
+The `console.page/resource/tab` extension has been removed. This extension was deprecated in favor
+of the `console.tab/horizontalNav` extension.
+
+In your `console-extensions.json` file, replace any usage of `console.page/resource/tab` with
+`console.tab/horizontalNav` using this pattern:
+
+```diff
+   {
+-    "type": "console.page/resource/tab",
++    "type": "console.tab/horizontalNav",
+     "properties": {
+-      "href": "path-to-page",
+       "model": {
+         "group": "group",
+         "version": "version",
+         "kind": "kind"
+       },
+-      "name": "%namespace~Name%",
++      "page": {
++        "name": "%namespace~Name%",
++        "href": "path-to-page"
++      },
+       "component": { "$codeRef": "resourcePages.resourcePage" }
+     }
+   },
+```
+
+### Removal of `console.dashboards/overview/detail/item` extension
+
+The `console.dashboards/overview/detail/item` extension has been removed. This
+extension was deprecated in favor of the `console.dashboards/custom/overview/detail/item` extension.
+
+In your `console-extensions.json` file, replace any usage of `console.dashboards/overview/detail/item`
+with `console.dashboards/custom/overview/detail/item` using this pattern:
+
+```diff
+   {
+-    "type": "console.dashboards/overview/detail/item",
++    "type": "console.dashboards/custom/overview/detail/item",
+     "properties": {
++      "title": "%namespace~Title%",
+       "component": { "$codeRef": "detailItems.customDetailItem" },
+     }
+   },
+```
+
 ## Removal of `@openshift-console/plugin-shared`
 
 The `@openshift-console/plugin-shared` package has been removed from the Console codebase, and the

frontend/packages/console-dynamic-plugin-sdk/src/extensions/cluster-overview.ts

@@ -50,17 +50,6 @@ export type ClusterOverviewMultilineUtilizationItem = Extension<
   }
 >;
 
-/**
- * @deprecated use CustomOverviewDetailItem type instead
- */
-export type OverviewDetailItem = Extension<
-  'console.dashboards/overview/detail/item',
-  {
-    /** The value, based on the DetailItem component */
-    component: CodeRef<ComponentType>;
-  }
->;
-
 /** Adds an item to the Details card of Overview Dashboard */
 export type CustomOverviewDetailItem = Extension<
   'console.dashboards/custom/overview/detail/item',
@@ -92,8 +81,5 @@ export const isClusterOverviewMultilineUtilizationItem = (
 ): e is ClusterOverviewMultilineUtilizationItem =>
   e.type === 'console.cluster-overview/multiline-utilization-item';
 
-export const isOverviewDetailItem = (e: Extension): e is OverviewDetailItem =>
-  e.type === 'console.dashboards/overview/detail/item';
-
 export const isCustomOverviewDetailItem = (e: Extension): e is CustomOverviewDetailItem =>
   e.type === 'console.dashboards/custom/overview/detail/item';

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

@@ -46,24 +46,6 @@ export type ResourceDetailsPage = Extension<
   ResourcePageProperties & {}
 >;
 
-/**
- * @deprecated - Use `console.tab/horizontalNav` instead
- * Adds new resource tab page to Console router.
- */
-export type ResourceTabPage = Extension<
-  'console.page/resource/tab',
-  Omit<ResourcePageProperties, 'component'> & {
-    /** The component to be rendered when the route matches. */
-    component: CodeRef<React.ComponentType>;
-    /** The name of the tab. */
-    name: string;
-    /** The optional href for the tab link. If not provided, the first `path` is used. */
-    href?: string;
-    /** When true, will only match if the path matches the `location.pathname` exactly. */
-    exact?: boolean;
-  }
->;
-
 /**
  * Adds new standalone page (rendered outside the common page layout) to Console router.
  *
@@ -87,7 +69,3 @@ export const isResourceListPage = (e: Extension): e is ResourceListPage =>
 
 export const isResourceDetailsPage = (e: Extension): e is ResourceDetailsPage =>
   e.type === 'console.page/resource/details';
-
-/** @deprecated - use `console.tab/horizontalNav` */
-export const isResourceTabPage = (e: Extension): e is ResourceTabPage =>
-  e.type === 'console.page/resource/tab';

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

@@ -6,7 +6,6 @@ import type {
   ClusterOverviewUtilizationItem,
   ClusterOverviewMultilineUtilizationItem,
   CustomOverviewDetailItem,
-  OverviewDetailItem,
 } from '../extensions/cluster-overview';
 import type { ClusterGlobalConfig } from '../extensions/cluster-settings';
 import type { ContextProvider } from '../extensions/context-providers';
@@ -49,7 +48,6 @@ import type {
   RoutePage,
   ResourceDetailsPage,
   ResourceListPage,
-  ResourceTabPage,
 } from '../extensions/pages';
 import type { Perspective } from '../extensions/perspectives';
 import type {
@@ -105,7 +103,6 @@ export type SupportedExtension =
   | SupportedTopologyDetailsExtensions
   | RoutePage
   | ResourceListPage
-  | ResourceTabPage
   | ResourceDetailsPage
   | DashboardsTab
   | DashboardsCard
@@ -135,7 +132,6 @@ export type SupportedExtension =
   | ClusterOverviewInventoryItem
   | ClusterOverviewUtilizationItem
   | ClusterOverviewMultilineUtilizationItem
-  | OverviewDetailItem
   | CustomOverviewDetailItem
   | ProjectOverviewUtilizationItem
   | ProjectOverviewInventoryItem

frontend/public/components/dashboard/dashboards-page/cluster-dashboard/details-card.tsx

@@ -15,11 +15,9 @@ import { useCanClusterUpgrade } from '@console/shared/src/hooks/useCanClusterUpg
 import { ErrorBoundaryInline } from '@console/shared/src/components/error';
 import {
   useResolvedExtensions,
-  isOverviewDetailItem,
   isCustomOverviewDetailItem,
   WatchK8sResource,
-  CustomOverviewDetailItem as CustomOverviewDetailItemType,
-  OverviewDetailItem as OverviewDetailItemType,
+  CustomOverviewDetailItem,
 } from '@console/dynamic-plugin-sdk';
 import { OverviewDetailItem } from '@console/internal/components/overview/OverviewDetailItem';
 import { ClusterVersionModel } from '../../../../models';
@@ -110,10 +108,7 @@ export const DetailsCard: React.FC = () => {
   const [clusterVersionData, clusterVersionLoaded, clusterVersionError] = useK8sWatchResource<
     ClusterVersionKind
   >(clusterVersionResource);
-  const [detailItemsExtensions] = useResolvedExtensions<OverviewDetailItemType>(
-    isOverviewDetailItem,
-  );
-  const [customDetailItemsExtensions] = useResolvedExtensions<CustomOverviewDetailItemType>(
+  const [customDetailItemsExtensions] = useResolvedExtensions<CustomOverviewDetailItem>(
     isCustomOverviewDetailItem,
   );
 
@@ -256,19 +251,6 @@ export const DetailsCard: React.FC = () => {
                     {t('public~No (single control plane node)')}
                   </OverviewDetailItem>
                 )}
-                {detailItemsExtensions.map((e) => {
-                  const Component = e.properties.component;
-                  return (
-                    <ErrorBoundaryInline
-                      key={e.uid}
-                      wrapper={({ children }) => (
-                        <OverviewDetailItem title="">{children}</OverviewDetailItem>
-                      )}
-                    >
-                      <Component />
-                    </ErrorBoundaryInline>
-                  );
-                })}
                 {customDetailItemsExtensions.map((e) => {
                   const { component: Component, error, isLoading, ...props } = e.properties;
                   return (