Added expand and upgrade activities in persistent storage dashboard

frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/activity-card.tsx

@@ -4,7 +4,7 @@ import DashboardCard from '@console/shared/src/components/dashboard/dashboard-ca
 import DashboardCardBody from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardBody';
 import DashboardCardHeader from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardHeader';
 import DashboardCardTitle from '@console/shared/src/components/dashboard/dashboard-card/DashboardCardTitle';
-import { EventKind } from '@console/internal/module/k8s';
+import { EventKind, K8sResourceKind } from '@console/internal/module/k8s';
 import { FirehoseResource, FirehoseResult } from '@console/internal/components/utils';
 import {
   EventModel,
@@ -21,12 +21,35 @@ import {
   DashboardItemProps,
   withDashboardResources,
 } from '@console/internal/components/dashboard/with-dashboard-resources';
-import { CEPH_STORAGE_NAMESPACE } from '../../../../constants/index';
+import { referenceForModel } from '@console/internal/module/k8s/k8s';
+import { SubscriptionModel, SubscriptionKind } from '@console/operator-lifecycle-manager';
+import { CEPH_STORAGE_NAMESPACE, OCS_OPERATOR } from '../../../../constants/index';
 import { DATA_RESILIENCY_QUERY, StorageDashboardQuery } from '../../../../constants/queries';
 import { getResiliencyProgress } from '../../../../utils';
+import { OCSServiceModel } from '../../../../models';
+import { isClusterExpandActivity, ClusterExpandActivity } from './cluster-expand-activity';
+import { isOCSUpgradeActivity, OCSUpgradeActivity } from './ocs-upgrade-activity';
 import './activity-card.scss';
 
 const eventsResource: FirehoseResource = { isList: true, kind: EventModel.kind, prop: 'events' };
+const subscriptionResource: FirehoseResource = {
+  isList: true,
+  kind: referenceForModel(SubscriptionModel),
+  namespaced: false,
+  prop: 'subs',
+};
+
+const storageClusterResource: FirehoseResource = {
+  isList: true,
+  kind: referenceForModel(OCSServiceModel),
+  namespaced: false,
+  prop: 'storage-cluster',
+};
+
+export const getOCSSubscription = (subscriptions: FirehoseResult): SubscriptionKind => {
+  const itemsData: K8sResourceKind[] = subscriptions?.data;
+  return _.find(itemsData, (item) => item?.spec?.name === OCS_OPERATOR) as SubscriptionKind;
+};
 
 const ocsEventNamespaceKindFilter = (event: EventKind): boolean =>
   getNamespace(event) === CEPH_STORAGE_NAMESPACE ||
@@ -51,12 +74,24 @@ const RecentEvent = withDashboardResources(
 );
 
 const OngoingActivity = withDashboardResources(
-  ({ watchPrometheus, stopWatchPrometheusQuery, prometheusResults }: DashboardItemProps) => {
+  ({
+    watchPrometheus,
+    stopWatchPrometheusQuery,
+    watchK8sResource,
+    stopWatchK8sResource,
+    resources,
+    prometheusResults,
+  }) => {
     React.useEffect(() => {
+      watchK8sResource(subscriptionResource);
+      watchK8sResource(storageClusterResource);
       watchPrometheus(DATA_RESILIENCY_QUERY[StorageDashboardQuery.RESILIENCY_PROGRESS]);
-      return () =>
+      return () => {
+        stopWatchK8sResource(subscriptionResource);
+        stopWatchK8sResource(storageClusterResource);
         stopWatchPrometheusQuery(DATA_RESILIENCY_QUERY[StorageDashboardQuery.RESILIENCY_PROGRESS]);
-    }, [watchPrometheus, stopWatchPrometheusQuery]);
+      };
+    }, [watchPrometheus, stopWatchPrometheusQuery, watchK8sResource, stopWatchK8sResource]);
 
     const progressResponse = prometheusResults.getIn([
       DATA_RESILIENCY_QUERY[StorageDashboardQuery.RESILIENCY_PROGRESS],
@@ -66,6 +101,15 @@ const OngoingActivity = withDashboardResources(
       DATA_RESILIENCY_QUERY[StorageDashboardQuery.RESILIENCY_PROGRESS],
       'loadError',
     ]);
+
+    const subscriptions = resources?.subs as FirehoseResult;
+    const subscriptionsLoaded = subscriptions?.loaded;
+    const ocsSubscription: SubscriptionKind = getOCSSubscription(subscriptions);
+
+    const storageClusters = resources?.['storage-cluster'] as FirehoseResult;
+    const storageClustersLoaded = storageClusters?.loaded;
+    const ocsCluster: K8sResourceKind = storageClusters?.data?.[0];
+
     const prometheusActivities = [];
     const resourceActivities = [];
 
@@ -76,17 +120,33 @@ const OngoingActivity = withDashboardResources(
       });
     }
 
+    if (isOCSUpgradeActivity(ocsSubscription)) {
+      resourceActivities.push({
+        resource: ocsSubscription,
+        timestamp: ocsSubscription?.status?.lastUpdated,
+        loader: () => Promise.resolve(OCSUpgradeActivity),
+      });
+    }
+
+    if (isClusterExpandActivity(ocsCluster)) {
+      resourceActivities.push({
+        resource: ocsCluster,
+        timestamp: null,
+        loader: () => Promise.resolve(ClusterExpandActivity),
+      });
+    }
+
     return (
       <OngoingActivityBody
-        loaded={progressResponse || progressError}
+        loaded={(progressResponse || progressError) && subscriptionsLoaded && storageClustersLoaded}
         resourceActivities={resourceActivities}
         prometheusActivities={prometheusActivities}
       />
     );
   },
 );
 
-export const ActivityCard: React.FC<{}> = React.memo(() => (
+export const ActivityCard: React.FC = React.memo(() => (
   <DashboardCard gradient>
     <DashboardCardHeader>
       <DashboardCardTitle>Activity</DashboardCardTitle>

frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/cluster-expand-activity.tsx

@@ -0,0 +1,10 @@
+import * as React from 'react';
+import ActivityItem from '@console/shared/src/components/dashboard/activity-card/ActivityItem';
+import { K8sResourceKind } from '@console/internal/module/k8s';
+
+export const ClusterExpandActivity: React.FC = () => (
+  <ActivityItem>Expanding OCS Cluster</ActivityItem>
+);
+
+export const isClusterExpandActivity = (storageCluster: K8sResourceKind): boolean =>
+  storageCluster?.status?.phase === 'Expanding';

frontend/packages/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/ocs-upgrade-activity.tsx

@@ -0,0 +1,11 @@
+import * as React from 'react';
+import ActivityItem from '@console/shared/src/components/dashboard/activity-card/ActivityItem';
+import { SubscriptionState, SubscriptionKind } from '@console/operator-lifecycle-manager';
+import { getSubscriptionStatus } from '@console/operator-lifecycle-manager/src/status/csv-status';
+
+export const isOCSUpgradeActivity = (subscription: SubscriptionKind): boolean =>
+  getSubscriptionStatus(subscription).status === SubscriptionState.SubscriptionStateUpgradePending;
+
+export const OCSUpgradeActivity: React.FC = () => (
+  <ActivityItem>Upgrading OCS Operator</ActivityItem>
+);

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

@@ -24,6 +24,8 @@ import {
   getPodStatusGroups,
   getPVCStatusGroups,
 } from '@console/shared/src/components/dashboard/inventory-card/utils';
+import { OCSServiceModel } from '@console/ceph-storage-plugin/src/models';
+import { isClusterExpandActivity } from '@console/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/cluster-expand-activity';
 import {
   fetchK8sHealth,
   getK8sHealthState,
@@ -81,6 +83,23 @@ const plugin: Plugin<ConsumedExtensions> = [
       required: FLAGS.CLUSTER_VERSION,
     },
   },
+  {
+    type: 'Dashboards/Overview/Activity/Resource',
+    properties: {
+      k8sResource: {
+        isList: true,
+        kind: referenceForModel(OCSServiceModel),
+        namespaced: false,
+        prop: 'storage-cluster',
+      },
+      isActivity: isClusterExpandActivity,
+      loader: () =>
+        import(
+          '@console/ceph-storage-plugin/src/components/dashboard-page/storage-dashboard/activity-card/cluster-expand-activity' /* webpackChunkName: "ceph-storage-plugin" */
+        ).then((m) => m.ClusterExpandActivity),
+      required: 'CEPH',
+    },
+  },
   {
     type: 'Dashboards/Overview/Health/URL',
     properties: {