fix: update resource conflict routes and payload structure for redeployment

Author: AbhishekA1509

src/Common/Constants.ts

@@ -162,7 +162,7 @@ export const ROUTES = {
     LICENSE_DATA: 'license/data',
     ENV: 'env',
     APP_METADATA: 'app-metadata',
-    RESOURCE_CONFLICTS_LIST: 'app/template/helm-ownership-conflicts',
+    RESOURCE_CONFLICTS_LIST: 'app/:appId/cd-pipeline/:pipelineId/history/:wfrId/helm-ownership-conflicts',
 } as const
 
 export enum KEY_VALUE {

src/Shared/Components/CICDHistory/service.tsx

@@ -15,6 +15,7 @@
  */
 
 /* eslint-disable dot-notation */
+import { generatePath } from 'react-router-dom'
 import moment from 'moment'
 
 import { ToastManager, ToastVariantType } from '@Shared/Services'
@@ -39,7 +40,6 @@ import {
     DeploymentStatusDetailsResponse,
     FetchIdDataStatus,
     GetResourceConflictDetailsParamsType,
-    GetResourceListItemPayloadType,
     ModuleConfigResponse,
     ResourceConflictItemType,
     ResourceConflictListItemDTO,
@@ -319,7 +319,7 @@ export const resourceConflictRedeploy = async ({
         pipelineId: +pipelineId,
         wfrIdForDeploymentWithSpecificTrigger: +triggerId,
         appId: +appId,
-        redeployHelmReleaseWithTakeOwnership: true,
+        helmRedeploymentRequest: true,
     })
 
     ToastManager.showToast({
@@ -335,13 +335,12 @@ export const getResourceConflictDetails = async ({
     triggerId,
     signal,
 }: GetResourceConflictDetailsParamsType): Promise<ResourceConflictItemType[]> => {
-    const { result } = await post<ResourceConflictListItemDTO, GetResourceListItemPayloadType>(
-        ROUTES.RESOURCE_CONFLICTS_LIST,
-        {
-            appId: +appId,
-            pipelineId: +pipelineId,
-            wfrId: +triggerId,
-        },
+    const { result } = await get<ResourceConflictListItemDTO>(
+        generatePath(ROUTES.RESOURCE_CONFLICTS_LIST, {
+            appId,
+            pipelineId,
+            wfrId: triggerId,
+        }),
         { signal },
     )
 

src/Shared/Components/CICDHistory/types.tsx

@@ -912,20 +912,14 @@ export interface ResourceConflictRedeployPayloadType {
     pipelineId: number
     appId: number
     wfrIdForDeploymentWithSpecificTrigger: number
-    redeployHelmReleaseWithTakeOwnership: true
+    helmRedeploymentRequest: true
 }
 
 export interface GetResourceConflictDetailsParamsType
     extends Pick<ResourceConflictDeployDialogURLParamsType, 'pipelineId' | 'triggerId' | 'appId'> {
     signal: AbortSignal
 }
 
-export interface GetResourceListItemPayloadType {
-    pipelineId: number
-    appId: number
-    wfrId: number
-}
-
 export interface ResourceConflictListItemDTO {
     clusterId: number
     conflictingResources: {