feat: Refactor EnvTriggerView and AppDetailsCDModal to remove unnecessary loading states and props

Author: AbhishekA1509

src/components/ApplicationGroup/Details/TriggerView/EnvTriggerView.tsx

@@ -91,7 +91,6 @@ const processDeploymentWindowStateAppGroup = importComponentFromFELibrary(
 const ChangeImageSource = importComponentFromFELibrary('ChangeImageSource', null, 'function')
 const WebhookAddImageModal = importComponentFromFELibrary('WebhookAddImageModal', null, 'function')
 
-// FIXME: IN CIMaterials we are sending isCDLoading while in CD materials we are sending isCILoading
 let inprogressStatusTimer
 const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultType) => {
     const { envId } = useParams<{ envId: string }>()
@@ -100,11 +99,7 @@ const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultT
     const match = useRouteMatch<CIMaterialRouterProps>()
     const { url } = useRouteMatch()
 
-    const abortControllerRef = useRef(new AbortController())
-
     const [pageViewType, setPageViewType] = useState<string>(ViewType.LOADING)
-    const [isCILoading, setCILoading] = useState(false)
-    const [isCDLoading, setCDLoading] = useState(false)
     const [isBranchChangeLoading, setIsBranchChangeLoading] = useState(false)
     const [showPreDeployment, setShowPreDeployment] = useState(false)
     const [showPostDeployment, setShowPostDeployment] = useState(false)
@@ -417,8 +412,6 @@ const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultT
         if (!appIds.length) {
             updateResponseListData(skippedResources)
             setIsBranchChangeLoading(false)
-            setCDLoading(false)
-            setCILoading(false)
             return
         }
 
@@ -436,8 +429,6 @@ const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultT
                     })
                 })
                 updateResponseListData([..._responseList, ...skippedResources])
-                setCDLoading(false)
-                setCILoading(false)
             })
             .catch((error) => {
                 showError(error)
@@ -448,8 +439,6 @@ const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultT
     }
 
     const closeCDModal = (): void => {
-        abortControllerRef.current.abort()
-        setCDLoading(false)
         history.push({
             search: '',
         })
@@ -464,7 +453,6 @@ const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultT
     }
 
     const hideBulkCDModal = () => {
-        setCDLoading(false)
         setShowBulkCDModal(false)
         setResponseList([])
 
@@ -479,16 +467,12 @@ const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultT
     }
 
     const hideBulkCIModal = () => {
-        setCILoading(false)
         setShowBulkCIModal(false)
         setResponseList([])
     }
 
     const onShowBulkCIModal = () => {
-        setCILoading(true)
-        setTimeout(() => {
-            setShowBulkCIModal(true)
-        }, 100)
+        setShowBulkCIModal(true)
     }
 
     const hideChangeSourceModal = () => {
@@ -666,7 +650,7 @@ const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultT
 
             return (
                 <ApprovalMaterialModal
-                    isLoading={isCDLoading}
+                    isLoading={false}
                     node={node ?? ({} as CommonNodeAttr)}
                     materialType={MATERIAL_TYPE.inputMaterialList}
                     stageType={DeploymentNodeType.CD}
@@ -751,23 +735,16 @@ const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultT
                     text="Build image"
                     onClick={onShowBulkCIModal}
                     size={ComponentSizeType.medium}
-                    isLoading={isCILoading}
                 />
                 <div className="flex">
                     <button
-                        className={`cta flex h-32 ${_showPopupMenu ? 'dc__no-right-radius' : ''}`}
+                        className={`cta flex h-32 dc__gap-8 ${_showPopupMenu ? 'dc__no-right-radius' : ''}`}
                         data-trigger-type="CD"
                         data-testid="bulk-deploy-button"
                         onClick={onShowBulkCDModal}
                     >
-                        {isCDLoading ? (
-                            <Progressing />
-                        ) : (
-                            <>
-                                <DeployIcon className="icon-dim-16 dc__no-svg-fill mr-8" />
-                                Deploy
-                            </>
-                        )}
+                        <DeployIcon className="icon-dim-16 dc__no-svg-fill" />
+                        Deploy
                     </button>
                     {_showPopupMenu && renderDeployPopupMenu()}
                 </div>

src/components/app/details/appDetails/AppDetailsCDModal.tsx

@@ -85,11 +85,6 @@ const AppDetailsCDModal = ({
                 isRedirectedFromAppDetails
                 handleSuccess={handleSuccess}
                 appName={appName}
-                // TODO: Not needed since not pre-post cd here
-                showPluginWarningBeforeTrigger={null}
-                consequence={null}
-                configurePluginURL={null}
-                isTriggerBlockedDueToPlugin={null}
             />
         )
 

src/components/app/details/triggerView/DeployImageModal/types.ts

@@ -29,9 +29,6 @@ export type DeployImageModalProps = {
     materialType: (typeof MATERIAL_TYPE)[keyof typeof MATERIAL_TYPE]
     handleClose: () => void
     envName: string
-    showPluginWarningBeforeTrigger: boolean
-    consequence: ConsequenceType
-    configurePluginURL: string
     /**
      * In case of appDetails trigger re-fetch of app details
      */
@@ -40,9 +37,21 @@ export type DeployImageModalProps = {
     isVirtualEnvironment: boolean
     isRedirectedFromAppDetails: boolean
     parentEnvironmentName: string
-    isTriggerBlockedDueToPlugin: boolean
     triggerType: CommonNodeAttr['triggerType']
-}
+} & (
+    | {
+          showPluginWarningBeforeTrigger: boolean
+          consequence: ConsequenceType
+          configurePluginURL: string
+          isTriggerBlockedDueToPlugin: boolean
+      }
+    | {
+          showPluginWarningBeforeTrigger?: never
+          consequence?: never
+          configurePluginURL?: never
+          isTriggerBlockedDueToPlugin?: never
+      }
+)
 
 export type DeployImageHeaderProps = Pick<
     DeployImageModalProps,