Merge pull request #15552 from logonoff/CONSOLE-4795-4801-4797-s1e2-diversity-day

CONSOLE-4795, CONSOLE-4801, CONSOLE-4797: Migrate some static extensions to dynamic

Author: openshift-merge-bot[bot]

dynamic-demo-plugin/console-extensions.json

@@ -473,5 +473,17 @@
         "prop": "nodes"
       }
     }
+  },
+  {
+    "type": "console.dashboards/overview/prometheus/activity/resource",
+    "properties": {
+      "queries": ["barQuery"],
+      "isActivity": {
+        "$codeRef": "PrometheusActivity.isDemoPrometheusActivity"
+      },
+      "component": {
+        "$codeRef": "PrometheusActivity.DemoPrometheusActivity"
+      }
+    }
   }
 ]

dynamic-demo-plugin/package.json

@@ -72,7 +72,8 @@
       "modalPage": "./components/Modals/ModalPage",
       "sampleErrorBoundaryPage": "./components/ErrorBoundary/SampleErrorBoundaryPage",
       "createProjectModal": "./components/Modals/CreateProjectModal",
-      "health": "./components/health"
+      "health": "./components/health",
+      "PrometheusActivity": "./components/PrometheusActivity"
     },
     "disableStaticPlugins": [
       "@console/demo-plugin"

dynamic-demo-plugin/src/components/PrometheusActivity.tsx

@@ -0,0 +1,7 @@
+import { PrometheusActivityProps } from '@openshift-console/dynamic-plugin-sdk';
+
+export const isDemoPrometheusActivity = () => true;
+
+export const DemoPrometheusActivity: React.FC<PrometheusActivityProps> = () => (
+  <div>Demo prometheus activity</div>
+);

frontend/packages/console-demo-plugin/src/components/dashboards/activity.tsx

@@ -1,11 +1,9 @@
 import * as React from 'react';
 import { ResourceLink } from '@console/internal/components/utils';
 import { NodeModel } from '@console/internal/models';
-import { PrometheusActivityProps, K8sActivityProps } from '@console/plugin-sdk';
+import { K8sActivityProps } from '@console/plugin-sdk';
 import { getNamespace, getName } from '@console/shared';
-import ActivityItem, {
-  ActivityProgress,
-} from '@console/shared/src/components/dashboard/activity-card/ActivityItem';
+import { ActivityProgress } from '@console/shared/src/components/dashboard/activity-card/ActivityItem';
 
 export const DemoActivity: React.FC<K8sActivityProps> = ({ resource }) => (
   <ActivityProgress title={`Demo activity for node ${getName(resource)}`} progress={30}>
@@ -16,7 +14,3 @@ export const DemoActivity: React.FC<K8sActivityProps> = ({ resource }) => (
     />
   </ActivityProgress>
 );
-
-export const DemoPrometheusActivity: React.FC<PrometheusActivityProps> = () => (
-  <ActivityItem>Demo prometheus activity</ActivityItem>
-);

frontend/packages/console-demo-plugin/src/plugin.tsx

@@ -11,7 +11,6 @@ import {
   DashboardsOverviewInventoryItem,
   DashboardsInventoryItemGroup,
   DashboardsOverviewResourceActivity,
-  DashboardsOverviewPrometheusActivity,
 } from '@console/plugin-sdk';
 import { DemoGroupIcon } from './components/dashboards/inventory';
 import { FooBarModel } from './models';
@@ -24,8 +23,7 @@ type ConsumedExtensions =
   | RoutePage
   | DashboardsOverviewInventoryItem
   | DashboardsInventoryItemGroup
-  | DashboardsOverviewResourceActivity
-  | DashboardsOverviewPrometheusActivity;
+  | DashboardsOverviewResourceActivity;
 
 const TEST_MODEL_FLAG = 'TEST_MODEL';
 
@@ -118,20 +116,6 @@ const plugin: Plugin<ConsumedExtensions> = [
       required: [TEST_MODEL_FLAG],
     },
   },
-  {
-    type: 'Dashboards/Overview/Activity/Prometheus',
-    properties: {
-      queries: ['barQuery'],
-      isActivity: () => true,
-      loader: () =>
-        import('./components/dashboards/activity' /* webpackChunkName: "demo" */).then(
-          (m) => m.DemoPrometheusActivity,
-        ),
-    },
-    flags: {
-      required: [TEST_MODEL_FLAG],
-    },
-  },
 ];
 
 export default plugin;

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

@@ -40,7 +40,6 @@ type OngoingActvityProps<T> = {
 export type OngoingActivityBodyProps = {
   resourceActivities?: (OngoingActvityProps<K8sResourceCommon> & {
     timestamp: Date;
-    loader?: () => Promise<React.ComponentType<Partial<OngoingActvityProps<K8sResourceCommon>>>>;
     component?: React.ComponentType<Partial<OngoingActvityProps<K8sResourceCommon>>>;
   })[];
   prometheusActivities?: {

frontend/packages/console-plugin-sdk/src/typings/dashboards.ts

@@ -1,5 +1,4 @@
 import { WatchK8sResources } from '@console/dynamic-plugin-sdk';
-import { PrometheusResponse } from '@console/internal/components/graphs';
 import { FirehoseResource } from '@console/internal/components/utils';
 import { K8sKind, K8sResourceKind } from '@console/internal/module/k8s';
 import {
@@ -58,28 +57,6 @@ namespace ExtensionProperties {
     /** Loader for corresponding action component */
     loader: LazyLoader<K8sActivityProps>;
   }
-
-  export interface DashboardsOverviewPrometheusActivity {
-    /** Queries to watch */
-    queries: string[];
-
-    /** Function which will determine if given query results represent the action */
-    isActivity: (results: PrometheusResponse[]) => boolean;
-
-    /** Loader for corresponding action component */
-    loader: LazyLoader<PrometheusActivityProps>;
-  }
-
-  export interface ProjectDashboardInventoryItem {
-    /** The K8s model which will be scoped to project, fetched and passed to `mapper` function. */
-    model: K8sKind;
-
-    /** Additional resources which will be fetched and passed to `mapper` function. */
-    additionalResources?: FirehoseResource[];
-
-    /** Function which will map various statuses to groups. */
-    mapper: StatusGroupMapper;
-  }
 }
 
 export interface DashboardsOverviewInventoryItem
@@ -108,24 +85,6 @@ export const isDashboardsOverviewResourceActivity = (
   e: Extension,
 ): e is DashboardsOverviewResourceActivity => e.type === 'Dashboards/Overview/Activity/Resource';
 
-export interface DashboardsOverviewPrometheusActivity
-  extends Extension<ExtensionProperties.DashboardsOverviewPrometheusActivity> {
-  type: 'Dashboards/Overview/Activity/Prometheus';
-}
-
-export const isDashboardsOverviewPrometheusActivity = (
-  e: Extension,
-): e is DashboardsOverviewPrometheusActivity =>
-  e.type === 'Dashboards/Overview/Activity/Prometheus';
-
-export interface ProjectDashboardInventoryItem
-  extends Extension<ExtensionProperties.ProjectDashboardInventoryItem> {
-  type: 'Project/Dashboard/Inventory/Item';
-}
-
-export const isProjectDashboardInventoryItem = (e: Extension): e is ProjectDashboardInventoryItem =>
-  e.type === 'Project/Dashboard/Inventory/Item';
-
 export interface DashboardsOverviewInventoryItemReplacement
   extends Extension<ExtensionProperties.DashboardsOverviewInventoryItem> {
   type: 'Dashboards/Overview/Inventory/Item/Replacement';
@@ -139,7 +98,3 @@ export const isDashboardsOverviewInventoryItemReplacement = (
 export type K8sActivityProps = {
   resource: K8sResourceKind;
 };
-
-export type PrometheusActivityProps = {
-  results: PrometheusResponse[];
-};

frontend/packages/console-plugin-sdk/src/typings/detail-page-bread-crumbs.ts

@@ -4,9 +4,7 @@ export * from './base';
 export * from './dashboards';
 export * from './features';
 export * from './models';
-export * from './overview';
 export * from './pages';
 export * from './global-configs';
 export * from './guided-tour';
 export * from './post-form-submit';
-export * from './detail-page-bread-crumbs';