Merge pull request #717 from navi-infra/INFRA-3897
INFRA-4004 | Abhishek | Ensure deleteObjectEndpoint is passed correctly to DeleteConfirmationPopup
This commit is contained in:
@@ -57,6 +57,7 @@ const DeleteResource = (props: DeleteResourceProps) => {
|
||||
const manifestId = values?.id;
|
||||
|
||||
const [isResourceDeployed, setIsResourceDeployed] = useState(false);
|
||||
const [deleteObjectEndpoint, setDeleteObjectEndpoint] = useState<string>('');
|
||||
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;
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user