Merge pull request #432 from devtron-labs/fix/ci-abort-loading

fix: set aborting false on abort close

Author: arunjaindev

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.1.7",
+    "version": "1.1.8",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -34,8 +34,8 @@ export class VisibleModal extends React.Component<{
     }
 
     escFunction(event) {
-        stopPropagation(event)
         if (event.keyCode === 27 || event.key === 'Escape') {
+            stopPropagation(event)
             if (this.props.onEscape) {
                 this.props.onEscape(event)
             } else if (this.props.close) {

src/Common/Modals/VisibleModal.tsx

@@ -166,14 +166,11 @@ const ProgressingStatus = React.memo(({ status, stage, type }: ProgressingStatus
                 variant: ToastVariantType.success,
                 description: 'Build Aborted',
             })
-            setAbortConfirmation(false)
             setAbortError({
                 status: false,
                 message: '',
             })
         } catch (error) {
-            setAborting(false)
-            setAbortConfirmation(false)
             if (error.code === 400) {
                 // code 400 is for aborting a running build
                 const { errors } = error
@@ -182,6 +179,9 @@ const ProgressingStatus = React.memo(({ status, stage, type }: ProgressingStatus
                     message: errors[0].userMessage,
                 })
             }
+        } finally {
+            setAborting(false)
+            setAbortConfirmation(false)
         }
     }
 

src/Shared/Components/CICDHistory/TriggerOutput.tsx

@@ -1,6 +1,7 @@
+import { useState, useCallback } from 'react'
 import { GenericEmptyState, VisibleModal } from '@Common/index'
 import { ComponentSizeType } from '@Shared/constants'
-import { useState, useCallback } from 'react'
+import ReactGA from 'react-ga4'
 import { ReactComponent as Close } from '@Icons/ic-close.svg'
 import { Button, ButtonStyleType, ButtonVariantType } from '../Button'
 
@@ -13,7 +14,13 @@ export const IframePromoButton = () => {
         FEATURE_PROMO_EMBEDDED_IFRAME_URL,
     } = window._env_
 
-    const onClickShowIframeModal = useCallback(() => setEmbeddedIframeModal(true), [])
+    const onClickShowIframeModal = useCallback(() => {
+        setEmbeddedIframeModal(true)
+        ReactGA.event({
+            category: 'PRIMARY_HEADER',
+            action: 'HEADER_IFRAME_BUTTON_CLICKED',
+        })
+    }, [])
     const onClickCloseIframeModal = useCallback(() => setEmbeddedIframeModal(false), [])
 
     const renderIframeDrawer = () => (