Merge pull request #15447 from cajieh/delete-pvc-action-item

OCPBUGS-60756: delete pvc  action item is placed in the middle of action list

Author: openshift-merge-bot[bot]

frontend/packages/console-app/src/actions/providers/persistent-volume-claim-provider.ts

@@ -3,22 +3,28 @@ import { usePVCActions } from '@console/app/src/actions/hooks/usePVCActions';
 import { Action } from '@console/dynamic-plugin-sdk';
 import { referenceFor, PersistentVolumeClaimKind } from '@console/internal/module/k8s';
 import { useK8sModel } from '@console/shared/src/hooks/useK8sModel';
-import { CommonActionCreator } from '../hooks/types';
+import { CommonActionCreator, PVCActionCreator } from '../hooks/types';
 import { useCommonActions } from '../hooks/useCommonActions';
 
 export const usePVCActionsProvider = (
   resource: PersistentVolumeClaimKind,
 ): [Action[], boolean, boolean] => {
   const [kindObj, inFlight] = useK8sModel(referenceFor(resource));
-  const actionsPVC = usePVCActions(resource);
+  const pvcActions = usePVCActions(resource, [
+    PVCActionCreator.ExpandPVC,
+    PVCActionCreator.PVCSnapshot,
+    PVCActionCreator.ClonePVC,
+  ]);
+  const pvcDeleteAction = usePVCActions(resource, [PVCActionCreator.DeletePVC]);
   const [commonActions] = useCommonActions(kindObj, resource, [
     CommonActionCreator.ModifyLabels,
     CommonActionCreator.ModifyAnnotations,
     CommonActionCreator.Edit,
   ]);
-  const actions = useMemo(() => [...actionsPVC, ...Object.values(commonActions)], [
-    actionsPVC,
-    commonActions,
-  ]);
+
+  const actions = useMemo(
+    () => [...pvcActions, ...Object.values(commonActions), ...pvcDeleteAction],
+    [pvcActions, commonActions, pvcDeleteAction],
+  );
   return [actions, !inFlight, false];
 };