fix: remove toast notifications from redeploy functions and update artifactId handling

Author: AbhishekA1509

src/Shared/Components/CICDHistory/ResourceConflictDeployDialog.tsx

@@ -3,7 +3,6 @@ import { useHistory, useParams } from 'react-router-dom'
 
 import { URLS } from '@Common/Constants'
 import { showError } from '@Common/Helper'
-import { ToastManager, ToastVariantType } from '@Shared/Services'
 
 import { ButtonStyleType } from '../Button'
 import { ConfirmationModal, ConfirmationModalVariantType } from '../ConfirmationModal'
@@ -24,12 +23,6 @@ const ResourceConflictDeployDialog = ({ appName, environmentName, handleClose }:
                 triggerId,
                 appId,
             })
-            ToastManager.showToast({
-                variant: ToastVariantType.success,
-                title: 'Redeploy initiated',
-                description: `Redeployment for application '${appName}' in environment '${environmentName}' has been initiated successfully.`,
-            })
-            handleClose()
             history.push(`${URLS.APP}/${appId}/details/${envId}`)
         } catch (error) {
             showError(error)

src/Shared/Components/CICDHistory/ResourceConflictDetailsModal.tsx

@@ -6,7 +6,6 @@ import { URLS } from '@Common/Constants'
 import { Drawer } from '@Common/Drawer'
 import { showError, stopPropagation } from '@Common/Helper'
 import { ComponentSizeType } from '@Shared/constants'
-import { ToastManager, ToastVariantType } from '@Shared/Services'
 
 import { APIResponseHandler } from '../APIResponseHandler'
 import { Button, ButtonStyleType, ButtonVariantType } from '../Button'
@@ -43,12 +42,6 @@ const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }:
                 triggerId,
                 appId,
             })
-            ToastManager.showToast({
-                variant: ToastVariantType.success,
-                title: 'Redeploy initiated',
-                description: `Redeployment for application '${appName}' in environment '${environmentName}' has been initiated successfully.`,
-            })
-            handleClose()
             history.push(`${URLS.APP}/${appId}/details/${envId}`)
         } catch (error) {
             showError(error)
@@ -119,11 +112,7 @@ const ResourceConflictDetailsModal = ({ appName, environmentName, handleClose }:
                             text="Re-deploy"
                             startIcon={<Icon name="ic-rocket-launch" color={null} />}
                             isLoading={isDeploying}
-                            disabled={
-                                !!resourceConflictDetailsError ||
-                                isLoadingResourceData ||
-                                resourceConflictDetails?.length === 0
-                            }
+                            disabled={!resourceConflictDetails?.length}
                             onClick={handleDeploy}
                         />
                     </div>

src/Shared/Components/CICDHistory/TriggerDetails.tsx

@@ -468,7 +468,7 @@ const TriggerDetails = memo(
             stage === DeploymentStageType.DEPLOY &&
             errorMessage?.includes(RESOURCE_CONFLICT_DEPLOY_ERROR)
 
-        const handleShowRedeployModal = () => {
+        const handleShowRedeployDialog = () => {
             setResourceConflictModal(ResourceConflictModalType.DEPLOY_DIALOG)
         }
 
@@ -643,7 +643,7 @@ const TriggerDetails = memo(
                                                 dataTestId: 'resource-conflict-re-deploy',
                                                 text: 'Re-deploy',
                                                 startIcon: <Icon name="ic-rocket-launch" color={null} />,
-                                                onClick: handleShowRedeployModal,
+                                                onClick: handleShowRedeployDialog,
                                                 variant: ButtonVariantType.text,
                                                 size: ComponentSizeType.medium,
                                             }}

src/Shared/Components/CICDHistory/TriggerOutput.tsx

@@ -261,7 +261,6 @@ const TriggerOutput = ({
     )
 
     const targetPlatforms = sanitizeTargetPlatforms(triggerDetails?.targetPlatforms)
-    const artifactId = triggerDetailsResult?.result?.artifactId || triggerDetails?.artifactId
 
     // Function to sync the trigger details as trigger details is also fetched with another api
     const syncState = (syncTriggerId: number, syncTriggerDetail: History, syncTriggerDetailsError: ServerError) => {
@@ -308,10 +307,12 @@ const TriggerOutput = ({
         () =>
             getTagDetails({
                 pipelineId,
-                artifactId,
+                artifactId: triggerDetailsResult?.result?.artifactId || triggerDetails?.artifactId,
             }),
         [pipelineId, triggerId],
-        areTagDetailsRequired && !!pipelineId && !!artifactId,
+        areTagDetailsRequired &&
+            !!pipelineId &&
+            (!!triggerDetailsResult?.result?.artifactId || !!triggerDetails?.artifactId),
     )
 
     useEffect(() => {
@@ -429,7 +430,7 @@ const TriggerOutput = ({
                 setFullScreenView={setFullScreenView}
                 deploymentAppType={deploymentAppType}
                 isBlobStorageConfigured={isBlobStorageConfigured}
-                artifactId={artifactId}
+                artifactId={triggerDetailsResult?.result?.artifactId}
                 ciPipelineId={triggerDetailsResult?.result?.ciPipelineId}
                 appReleaseTags={appReleaseTags}
                 tagsEditable={tagsEditable}

src/Shared/Components/CICDHistory/service.tsx

@@ -17,6 +17,7 @@
 /* eslint-disable dot-notation */
 import moment from 'moment'
 
+import { ToastManager, ToastVariantType } from '@Shared/Services'
 import { GVKType, K8S_EMPTY_GROUP } from '@Pages/ResourceBrowser'
 
 import {
@@ -309,14 +310,25 @@ export const getTriggerHistory = async ({
 export const getModuleConfigured = (moduleName: string): Promise<ModuleConfigResponse> =>
     get(`${ROUTES.MODULE_CONFIGURED}?name=${moduleName}`)
 
-export const resourceConflictRedeploy = async ({ pipelineId, triggerId, appId }: ResourceConflictRedeployParamsType) =>
-    post<never, ResourceConflictRedeployPayloadType>(ROUTES.CD_TRIGGER_POST, {
+export const resourceConflictRedeploy = async ({
+    pipelineId,
+    triggerId,
+    appId,
+}: ResourceConflictRedeployParamsType) => {
+    await post<never, ResourceConflictRedeployPayloadType>(ROUTES.CD_TRIGGER_POST, {
         pipelineId: +pipelineId,
         wfrIdForDeploymentWithSpecificTrigger: +triggerId,
         appId: +appId,
         redeployHelmReleaseWithTakeOwnership: true,
     })
 
+    ToastManager.showToast({
+        variant: ToastVariantType.success,
+        title: 'Redeployment initiated',
+        description: 'Redeployment for application has been successfully initiated.',
+    })
+}
+
 export const getResourceConflictDetails = async ({
     appId,
     pipelineId,