Merge pull request #15772 from vikram-raj/console-4709-public-3

CONSOLE-4709: Remove kebab factory uses from resourceQuota and pod-list pages

Author: openshift-merge-bot[bot]

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

@@ -432,7 +432,9 @@
         "kind": "VolumeAttributesClass",
         "group": "storage.k8s.io"
       },
-      "provider": { "$codeRef": "volumeAttributesClassProvider.useVolumeAttributesClassActionsProvider" }
+      "provider": {
+        "$codeRef": "volumeAttributesClassProvider.useVolumeAttributesClassActionsProvider"
+      }
     },
     "flags": {
       "required": ["VAC_PLATFORM_SUPPORT"]
@@ -528,6 +530,28 @@
       "provider": { "$codeRef": "prometheusProvider.usePrometheusActionsProvider" }
     }
   },
+  {
+    "type": "console.action/resource-provider",
+    "properties": {
+      "model": {
+        "group": "",
+        "version": "v1",
+        "kind": "ResourceQuota"
+      },
+      "provider": { "$codeRef": "defaultProvider.useDefaultActionsProvider" }
+    }
+  },
+  {
+    "type": "console.action/resource-provider",
+    "properties": {
+      "model": {
+        "group": "quota.openshift.io",
+        "version": "v1",
+        "kind": "ClusterResourceQuota"
+      },
+      "provider": { "$codeRef": "defaultProvider.useDefaultActionsProvider" }
+    }
+  },
   {
     "type": "console.page/route",
     "properties": {
@@ -1286,8 +1310,8 @@
         "kind": "VolumeAttributesClass"
       }
     },
-    "flags": { 
-      "required": ["VAC_PLATFORM_SUPPORT"] 
+    "flags": {
+      "required": ["VAC_PLATFORM_SUPPORT"]
     }
   },
   {

frontend/public/components/pod-list.tsx

@@ -54,7 +54,6 @@ import { sortResourceByValue } from './factory/Table/sort';
 import { PROMETHEUS_BASE_PATH, PROMETHEUS_TENANCY_BASE_PATH } from './graphs/consts';
 import { PodTraffic } from './pod-traffic';
 import { useK8sWatchResource } from './utils/k8s-watch-hook';
-import { Kebab } from './utils/kebab';
 import { LabelList } from './utils/label-list';
 import { OwnerReferences } from './utils/owner-references';
 import { ResourceLink, resourcePath } from './utils/resource-link';
@@ -97,8 +96,6 @@ const fetchPodMetrics = (namespace: string): Promise<UIActions.PodMetrics> => {
   return Promise.all(promises).then((data: unknown[]) => _.assign({}, ...data));
 };
 
-export const menuActions = [...(Kebab.factory.common || [])];
-
 const tableColumnInfo = [
   { id: 'name' },
   { id: 'namespace' },

frontend/public/components/resource-quota.jsx

@@ -18,7 +18,6 @@ import { FLAGS } from '@console/shared/src/constants/common';
 import { YellowExclamationTriangleIcon } from '@console/shared/src/components/status/icons';
 import { DASH } from '@console/shared/src/constants/ui';
 import { DetailsPage, MultiListPage } from './factory';
-import { Kebab, ResourceKebab } from './utils/kebab';
 import { SectionHeading } from './utils/headings';
 import { navFactory } from './utils/horizontal-nav';
 import { ResourceLink } from './utils/resource-link';
@@ -54,50 +53,22 @@ import {
   actionsCellProps,
   cellIsStickyProps,
 } from '@console/app/src/components/data-view/ConsoleDataView';
-
-const { common } = Kebab.factory;
-
-const resourceQuotaMenuActions = [...common];
-const clusterResourceQuotaMenuActions = [...common];
-const appliedClusterResourceQuotaMenuActions = (namespace) => [
-  Kebab.factory.ModifyLabels,
-  Kebab.factory.ModifyAnnotations,
-  (kind, obj) => {
-    return {
-      // t('public~Edit AppliedClusterResourceQuota')
-      labelKey: 'public~Edit AppliedClusterResourceQuota',
-      href: `/k8s/ns/${namespace}/${referenceForModel(AppliedClusterResourceQuotaModel)}/${
-        obj.metadata.name
-      }/yaml`,
-      accessReview: {
-        group: kind.apiGroup,
-        resource: kind.plural,
-        name: obj.metadata.name,
-        namespace,
-        verb: 'update',
-      },
-    };
-  },
-  Kebab.factory.Delete,
-];
+import LazyActionMenu from '@console/shared/src/components/actions/LazyActionMenu';
 
 const isClusterQuota = (quota) => !quota.metadata.namespace;
 
 const clusterQuotaReference = referenceForModel(ClusterResourceQuotaModel);
 const appliedClusterQuotaReference = referenceForModel(AppliedClusterResourceQuotaModel);
 
-const quotaActions = (quota, namespace = undefined) => {
-  if (quota.metadata.namespace) {
-    return resourceQuotaMenuActions;
+const quotaActions = (quota) => {
+  if (quota.kind === 'ResourceQuota') {
+    return <LazyActionMenu context={{ [referenceForModel(ResourceQuotaModel)]: quota }} />;
   }
 
   if (quota.kind === 'ClusterResourceQuota') {
-    return clusterResourceQuotaMenuActions;
-  }
-
-  if (quota.kind === 'AppliedClusterResourceQuota') {
-    return appliedClusterResourceQuotaMenuActions(namespace);
+    return <LazyActionMenu context={{ [clusterQuotaReference]: quota }} />;
   }
+  return null;
 };
 
 export const getQuotaResourceTypes = (quota) => {
@@ -174,7 +145,6 @@ const appliedClusterResourceQuotaTableColumnInfo = [
   { id: 'projectAnnotations' },
   { id: 'status' },
   { id: 'created' },
-  { id: 'actions' },
 ];
 
 const QuotaStatus = ({ resourcesAtQuota }) => {
@@ -479,14 +449,7 @@ const getResourceQuotaDataViewRows = (data, columns, namespace) => {
         cell: <Timestamp timestamp={metadata.creationTimestamp} />,
       },
       [resourceQuotaTableColumnInfo[6].id]: {
-        cell: (
-          <ResourceKebab
-            customData={namespace}
-            actions={quotaActions(obj, namespace)}
-            kind={resourceKind}
-            resource={obj}
-          />
-        ),
+        cell: quotaActions(obj),
         props: actionsCellProps,
       },
     };
@@ -548,17 +511,6 @@ const getAppliedClusterResourceQuotaDataViewRows = (data, columns, namespace) =>
       [appliedClusterResourceQuotaTableColumnInfo[4].id]: {
         cell: <Timestamp timestamp={metadata.creationTimestamp} />,
       },
-      [appliedClusterResourceQuotaTableColumnInfo[5].id]: {
-        cell: (
-          <ResourceKebab
-            customData={namespace}
-            actions={quotaActions(obj, namespace)}
-            kind={appliedClusterQuotaReference}
-            resource={obj}
-          />
-        ),
-        props: actionsCellProps,
-      },
     };
 
     return columns.map(({ id }) => {
@@ -705,13 +657,6 @@ const useAppliedClusterResourceQuotaColumns = () => {
           modifier: 'nowrap',
         },
       },
-      {
-        title: '',
-        id: appliedClusterResourceQuotaTableColumnInfo[5].id,
-        props: {
-          ...cellIsStickyProps,
-        },
-      },
     ],
     [t],
   );
@@ -848,22 +793,14 @@ export const AppliedClusterResourceQuotasPage = ({ namespace, mock, showTitle })
 };
 
 export const ResourceQuotasDetailsPage = (props) => {
-  return (
-    <DetailsPage
-      {...props}
-      menuActions={resourceQuotaMenuActions}
-      pages={[navFactory.details(Details), navFactory.editYaml()]}
-    />
-  );
+  return <DetailsPage {...props} pages={[navFactory.details(Details), navFactory.editYaml()]} />;
 };
 
 export const AppliedClusterResourceQuotasDetailsPage = (props) => {
-  const params = useParams();
-  const actions = appliedClusterResourceQuotaMenuActions(params?.ns);
   return (
     <DetailsPage
       {...props}
-      menuActions={actions}
+      kind={appliedClusterQuotaReference}
       pages={[navFactory.details(Details), navFactory.editYaml()]}
     />
   );

frontend/public/locales/en/public.json

@@ -1246,7 +1246,6 @@
   "Clear history": "Clear history",
   "Recently used": "Recently used",
   "Clear input value": "Clear input value",
-  "Edit AppliedClusterResourceQuota": "Edit AppliedClusterResourceQuota",
   "{{count}} resource reached quota_one": "{{count}} resource reached quota",
   "{{count}} resource reached quota_other": "{{count}} resource reached quotas",
   "none are at quota": "none are at quota",