Revert "CONSOLE-3769: Remove usage of legacy Extension"

This reverts commit 4087fcb.

Author: logonoff

frontend/packages/console-app/src/__tests__/plugin-test-utils.ts

@@ -1,16 +1,13 @@
 import { List as ImmutableList } from 'immutable';
 import * as _ from 'lodash';
-import type { ExtensionDeclaration } from '@console/dynamic-plugin-sdk/src/types';
-import { PluginStore } from '@console/plugin-sdk';
+import { Extension, PluginStore } from '@console/plugin-sdk';
 import { loadActivePluginsForTestPurposes } from '@console/plugin-sdk/src/codegen/active-plugins';
 import { resolvePluginPackages } from '@console/plugin-sdk/src/codegen/plugin-resolver';
 
 const testedPlugins = loadActivePluginsForTestPurposes(resolvePluginPackages());
 const testedPluginStore = new PluginStore(testedPlugins);
 
-export const testedExtensions = ImmutableList<ExtensionDeclaration>(
-  testedPluginStore.getExtensions(),
-);
+export const testedExtensions = ImmutableList<Extension>(testedPluginStore.getExtensions());
 
 export const getDuplicates = (values: string[]) => {
   return _.transform(

frontend/packages/console-dynamic-plugin-sdk/src/coderefs/__tests__/coderef-resolver.spec.ts

@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import { ExtensionDeclaration, EncodedCodeRef, CodeRef } from '../../types';
+import { Extension, EncodedCodeRef, CodeRef } from '../../types';
 import {
   getExecutableCodeRefMock,
   getEntryModuleMocks,
@@ -208,7 +208,7 @@ describe('loadReferencedObject', () => {
 
 describe('resolveEncodedCodeRefs', () => {
   it('replaces encoded code references with CodeRef functions', async () => {
-    const extensions: ExtensionDeclaration[] = [
+    const extensions: Extension[] = [
       {
         type: 'Foo',
         properties: {
@@ -247,7 +247,7 @@ describe('resolveEncodedCodeRefs', () => {
   });
 
   it('clones the provided extensions array and its elements', () => {
-    const extensions: ExtensionDeclaration[] = [
+    const extensions: Extension[] = [
       { type: 'Foo', properties: { test: true } },
       { type: 'Bar', properties: { test: [1] } },
     ];
@@ -274,7 +274,7 @@ describe('resolveEncodedCodeRefs', () => {
 
 describe('resolveExtension', () => {
   it('replaces CodeRef functions with referenced objects', async () => {
-    const extensions: ExtensionDeclaration[] = [
+    const extensions: Extension[] = [
       {
         type: 'Foo',
         properties: {
@@ -309,7 +309,7 @@ describe('resolveExtension', () => {
   });
 
   it('logs a warning if the referenced object resolves to null or undefined', async () => {
-    const extensions: ExtensionDeclaration[] = [
+    const extensions: Extension[] = [
       {
         type: 'Foo',
         properties: {
@@ -343,7 +343,7 @@ describe('resolveExtension', () => {
   });
 
   it('returns the same extension instance', async () => {
-    const extensions: ExtensionDeclaration[] = [
+    const extensions: Extension[] = [
       {
         type: 'Foo',
         properties: { test: true },
@@ -361,7 +361,7 @@ describe('resolveExtension', () => {
   it('continuously reject code refs which have failed to resolve', async () => {
     const errorCodeRef = getErrorExecutableCodeRefMock();
 
-    const extension: ExtensionDeclaration = {
+    const extension: Extension = {
       type: 'Foo',
       properties: { test: true, qux: errorCodeRef },
     };

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { ExtensionHook, ExtensionK8sKindVersionModel } from '../api/common-types';
 import { ActionContext } from '../api/internal-types';
-import { ExtensionDeclaration, CodeRef } from '../types';
+import { Extension, ExtensionDeclaration, CodeRef } from '../types';
 import { AccessReviewResourceAttributes } from './console-types';
 
 /** ActionProvider contributes a hook that returns list of actions for specific context */
@@ -74,19 +74,19 @@ export type SupportedActionExtensions =
 
 // Type Guards
 
-export const isActionProvider = (e: ExtensionDeclaration): e is ActionProvider => {
+export const isActionProvider = (e: Extension): e is ActionProvider => {
   return e.type === 'console.action/provider';
 };
 
-export const isResourceActionProvider = (e: ExtensionDeclaration): e is ResourceActionProvider => {
+export const isResourceActionProvider = (e: Extension): e is ResourceActionProvider => {
   return e.type === 'console.action/resource-provider';
 };
 
-export const isActionGroup = (e: ExtensionDeclaration): e is ActionGroup => {
+export const isActionGroup = (e: Extension): e is ActionGroup => {
   return e.type === 'console.action/group';
 };
 
-export const isActionFilter = (e: ExtensionDeclaration): e is ActionFilter => {
+export const isActionFilter = (e: Extension): e is ActionFilter => {
   return e.type === 'console.action/filter';
 };
 

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ExtensionDeclaration, CodeRef } from '../types';
+import { Extension, ExtensionDeclaration, CodeRef } from '../types';
 import { AccessReviewResourceAttributes } from './console-types';
 
 /** This extension allows plugins to contribute an add action item to the add page of developer perspective.
@@ -48,10 +48,10 @@ export type AddActionGroup = ExtensionDeclaration<
 
 // Type guards
 
-export const isAddAction = (e: ExtensionDeclaration): e is AddAction => {
+export const isAddAction = (e: Extension): e is AddAction => {
   return e.type === 'dev-console.add/action';
 };
 
-export const isAddActionGroup = (e: ExtensionDeclaration): e is AddActionGroup => {
+export const isAddActionGroup = (e: Extension): e is AddActionGroup => {
   return e.type === 'dev-console.add/action-group';
 };

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

@@ -1,5 +1,5 @@
 import { Rule, PrometheusRulesResponse } from '../api/common-types';
-import { ExtensionDeclaration, CodeRef } from '../types';
+import { CodeRef, Extension, ExtensionDeclaration } from '../types';
 
 type AlertingRulesFetch = (namespace?: string) => Promise<PrometheusRulesResponse>;
 
@@ -31,8 +31,8 @@ export type AlertingRuleChartExtension = ExtensionDeclaration<
 
 // Type guards
 
-export const isAlertingRulesSource = (e: ExtensionDeclaration): e is AlertingRulesSourceExtension =>
+export const isAlertingRulesSource = (e: Extension): e is AlertingRulesSourceExtension =>
   e.type === 'console.alerts/rules-source';
 
-export const isAlertingRuleChart = (e: ExtensionDeclaration): e is AlertingRuleChartExtension =>
+export const isAlertingRuleChart = (e: Extension): e is AlertingRuleChartExtension =>
   e.type === 'console.alerts/rules-chart';

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

@@ -1,5 +1,5 @@
 import { K8sModel } from '../api/common-types';
-import { ExtensionDeclaration, CodeRef } from '../types';
+import { CodeRef, Extension, ExtensionDeclaration } from '../types';
 
 export type DetailsPageBreadCrumbsHook = (
   kind: K8sModel,
@@ -22,5 +22,5 @@ export type DetailPageBreadCrumbs = ExtensionDeclaration<
 
 // Type guards
 
-export const isDetailPageBreadCrumbs = (e: ExtensionDeclaration): e is DetailPageBreadCrumbs =>
+export const isDetailPageBreadCrumbs = (e: Extension): e is DetailPageBreadCrumbs =>
   e.type === 'dev-console.detailsPage/breadcrumbs';

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { ExtensionHook } from '../api/common-types';
-import { ExtensionDeclaration, CodeRef } from '../types';
+import { Extension, ExtensionDeclaration, CodeRef } from '../types';
 
 /** This extension allows plugins to contribute a new type of catalog item. For example, a Helm plugin can define
     a new catalog item type as HelmCharts that it wants to contribute to the Software Catalog. */
@@ -109,33 +109,27 @@ export type SupportedCatalogExtensions =
 
 // Type guards
 
-export const isCatalogItemType = (e: ExtensionDeclaration): e is CatalogItemType => {
+export const isCatalogItemType = (e: Extension): e is CatalogItemType => {
   return e.type === 'console.catalog/item-type';
 };
 
-export const isCatalogItemTypeMetadata = (
-  e: ExtensionDeclaration,
-): e is CatalogItemTypeMetadata => {
+export const isCatalogItemTypeMetadata = (e: Extension): e is CatalogItemTypeMetadata => {
   return e.type === 'console.catalog/item-type-metadata';
 };
 
-export const isCatalogItemProvider = (e: ExtensionDeclaration): e is CatalogItemProvider => {
+export const isCatalogItemProvider = (e: Extension): e is CatalogItemProvider => {
   return e.type === 'console.catalog/item-provider';
 };
 
-export const isCatalogItemFilter = (e: ExtensionDeclaration): e is CatalogItemFilter => {
+export const isCatalogItemFilter = (e: Extension): e is CatalogItemFilter => {
   return e.type === 'console.catalog/item-filter';
 };
 
-export const isCatalogItemMetadataProvider = (
-  e: ExtensionDeclaration,
-): e is CatalogItemMetadataProvider => {
+export const isCatalogItemMetadataProvider = (e: Extension): e is CatalogItemMetadataProvider => {
   return e.type === 'console.catalog/item-metadata';
 };
 
-export const isCatalogCategoriesProvider = (
-  e: ExtensionDeclaration,
-): e is CatalogCategoriesProvider => {
+export const isCatalogCategoriesProvider = (e: Extension): e is CatalogCategoriesProvider => {
   return e.type === 'console.catalog/categories-provider';
 };
 

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { JSONSchema7Type } from 'json-schema';
-import { ExtensionDeclaration, CodeRef } from '../types';
+import { Extension, ExtensionDeclaration, CodeRef } from '../types';
 import { AccessReviewResourceAttributes } from './console-types';
 
 export type Resource = {
@@ -114,14 +114,10 @@ export type ClusterConfigurationItem = ExtensionDeclaration<
 
 // Type guards
 
-export const isClusterConfigurationGroup = (
-  e: ExtensionDeclaration,
-): e is ClusterConfigurationGroup => {
+export const isClusterConfigurationGroup = (e: Extension): e is ClusterConfigurationGroup => {
   return e.type === 'console.cluster-configuration/group';
 };
 
-export const isClusterConfigurationItem = (
-  e: ExtensionDeclaration,
-): e is ClusterConfigurationItem => {
+export const isClusterConfigurationItem = (e: Extension): e is ClusterConfigurationItem => {
   return e.type === 'console.cluster-configuration/item';
 };

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { OverviewDetailItemProps } from '@openshift-console/plugin-shared/src';
-import { ExtensionDeclaration, CodeRef } from '../types';
+import { CodeRef, Extension, ExtensionDeclaration } from '../types';
 import { Humanize, TopConsumerPopoverProps, QueryWithDescription } from './console-types';
 
 /** Adds a new inventory item into cluster overview page. */
@@ -77,22 +77,20 @@ export type CustomOverviewDetailItem = ExtensionDeclaration<
 
 // Type guards
 
-export const isClusterOverviewInventoryItem = (
-  e: ExtensionDeclaration,
-): e is ClusterOverviewInventoryItem => e.type === 'console.cluster-overview/inventory-item';
+export const isClusterOverviewInventoryItem = (e: Extension): e is ClusterOverviewInventoryItem =>
+  e.type === 'console.cluster-overview/inventory-item';
 
 export const isClusterOverviewUtilizationItem = (
-  e: ExtensionDeclaration,
+  e: Extension,
 ): e is ClusterOverviewUtilizationItem => e.type === 'console.cluster-overview/utilization-item';
 
 export const isClusterOverviewMultilineUtilizationItem = (
-  e: ExtensionDeclaration,
+  e: Extension,
 ): e is ClusterOverviewMultilineUtilizationItem =>
   e.type === 'console.cluster-overview/multiline-utilization-item';
 
-export const isOverviewDetailItem = (e: ExtensionDeclaration): e is OverviewDetailItem =>
+export const isOverviewDetailItem = (e: Extension): e is OverviewDetailItem =>
   e.type === 'console.dashboards/overview/detail/item';
 
-export const isCustomOverviewDetailItem = (
-  e: ExtensionDeclaration,
-): e is CustomOverviewDetailItem => e.type === 'console.dashboards/custom/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/cluster-settings.ts

@@ -1,5 +1,6 @@
 import { ExtensionK8sModel } from '../api/common-types';
-import { ExtensionDeclaration } from '../types';
+import { Extension, ExtensionDeclaration } from '../types';
+
 /** This extension identifies a resource used to manage the configuration of the cluster.
     A link to the resource will be added to the Administration - Cluster Settings - Configuration page. */
 export type ClusterGlobalConfig = ExtensionDeclaration<
@@ -18,5 +19,5 @@ export type ClusterGlobalConfig = ExtensionDeclaration<
 
 // Type guards
 
-export const isClusterGlobalConfig = (e: ExtensionDeclaration): e is ClusterGlobalConfig =>
+export const isClusterGlobalConfig = (e: Extension): e is ClusterGlobalConfig =>
   e.type === 'console.global-config';