From 1ab53a0b0bad8712e1a9b8c4762392023fdd7614 Mon Sep 17 00:00:00 2001 From: Abhishek Katiyar Date: Wed, 13 Nov 2024 06:19:47 +0530 Subject: [PATCH] INFRA-3897 | Abhishek | Ensure deleteObjectEndpoint is passed correctly to DeleteConfirmationPopup --- src/components/common/DeleteResource.tsx | 31 ++++++++++++++---------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/components/common/DeleteResource.tsx b/src/components/common/DeleteResource.tsx index 7aee989..ef9a2a2 100644 --- a/src/components/common/DeleteResource.tsx +++ b/src/components/common/DeleteResource.tsx @@ -57,6 +57,7 @@ const DeleteResource = (props: DeleteResourceProps) => { const manifestId = values?.id; const [isResourceDeployed, setIsResourceDeployed] = useState(false); + const [deleteObjectEndpoint, setDeleteObjectEndpoint] = useState(''); const [loading, setLoading] = useState(false); function getPathAndIndex(fieldPath) { @@ -78,12 +79,12 @@ const DeleteResource = (props: DeleteResourceProps) => { if (KubeResourceNameMap.hasOwnProperty(fieldName)) { resourceName = KubeResourceNameMap[fieldName]; } - let getStatusEndpoint, deleteObjectEndpoint; + let getStatusEndpoint; const isCheckFromBackendNeeded = () => { if (Array.isArray(objectAtFieldPath)) { getStatusEndpoint = API_GET_K8S_RESOURCE_STATUS_ALL(manifestId, resourceName); - deleteObjectEndpoint = API_DELETE_K8S_RESOURCE_ALL(manifestId, resourceName); + setDeleteObjectEndpoint(API_DELETE_K8S_RESOURCE_ALL(manifestId, resourceName)); return true; } else if (fieldName in FieldUniqueIdentifierMap) { let uniqueIdentifierName = FieldUniqueIdentifierMap[fieldName]; @@ -97,21 +98,25 @@ const DeleteResource = (props: DeleteResourceProps) => { uniqueIdentifierName, uniqueIdentifierValue, ); - deleteObjectEndpoint = API_GET_STATUS_OR_DELETE_K8S_RESOURCE( - manifestId, - resourceName, - uniqueIdentifierName, - uniqueIdentifierValue, + setDeleteObjectEndpoint( + API_GET_STATUS_OR_DELETE_K8S_RESOURCE( + manifestId, + resourceName, + uniqueIdentifierName, + uniqueIdentifierValue, + ), ); return true; } else if (FieldUniqueIdentifierMap[fieldName] in objectAtFieldPath) { let uniqueIdentifierName = FieldUniqueIdentifierMap[fieldName]; let uniqueIdentifierValue = getIn(objectAtFieldPath, uniqueIdentifierName); - deleteObjectEndpoint = API_GET_STATUS_OR_DELETE_K8S_RESOURCE( - manifestId, - resourceName, - uniqueIdentifierName, - uniqueIdentifierValue, + setDeleteObjectEndpoint( + API_GET_STATUS_OR_DELETE_K8S_RESOURCE( + manifestId, + resourceName, + uniqueIdentifierName, + uniqueIdentifierValue, + ), ); getStatusEndpoint = API_GET_STATUS_OR_DELETE_K8S_RESOURCE( manifestId, @@ -122,7 +127,7 @@ const DeleteResource = (props: DeleteResourceProps) => { return true; } else { getStatusEndpoint = API_GET_STATUS_OR_DELETE_K8S_RESOURCE(manifestId, resourceName); - deleteObjectEndpoint = API_GET_STATUS_OR_DELETE_K8S_RESOURCE(manifestId, resourceName); + setDeleteObjectEndpoint(API_GET_STATUS_OR_DELETE_K8S_RESOURCE(manifestId, resourceName)); return true; } };