Merge branch 'main' into fix/ci-pipeline-override

Author: AbhishekA1509

src/components/app/Overview/Overview.tsx

@@ -35,6 +35,7 @@ import { EnvironmentList } from './EnvironmentList'
 import { MAX_LENGTH_350 } from '../../../config/constantMessaging'
 import { getModuleInfo } from '../../v2/devtronStackManager/DevtronStackManager.service'
 import { MODAL_STATE, OVERVIEW_TABS, TAB_SEARCH_KEY } from './constants'
+import ReactGA from 'react-ga4'
 const MandatoryTagWarning = importComponentFromFELibrary('MandatoryTagWarning')
 const Catalog = importComponentFromFELibrary('Catalog')
 const DependencyList = importComponentFromFELibrary('DependencyList')
@@ -87,6 +88,15 @@ export default function AppOverview({ appMetaInfo, getAppMetaInfoRes, filteredEn
         history.replace({ search: searchParams.toString() })
     }
 
+    const handleEditDependencyClick = () => {
+        ReactGA.event({
+            category: 'Application Dependency',
+            action: 'Edit Dependency click',
+            label: 'Edit Dependency click',
+        })
+        toggleUpdateDependencyModal()
+    }
+
     useEffect(() => {
         // add a default tab if not set
         if (!activeTab || !Object.values(OVERVIEW_TABS).includes(activeTab)) {
@@ -481,6 +491,7 @@ export default function AppOverview({ appMetaInfo, getAppMetaInfoRes, filteredEn
                             isUpdateModalOpen={isUpdateDependencyModalOpen}
                             toggleUpdateModalOpen={toggleUpdateDependencyModal}
                             toggleButtonDisabledState={setIsEditDependencyButtonDisabled}
+                            filteredEnvIds={filteredEnvIds}
                         />
                     ) : null,
             }
@@ -507,7 +518,7 @@ export default function AppOverview({ appMetaInfo, getAppMetaInfoRes, filteredEn
                             <button
                                 type="button"
                                 className={`cta flex h-28 dc__gap-4 ${isEditDependencyButtonDisabled ? 'disabled-opacity' : ''}`}
-                                onClick={isEditDependencyButtonDisabled ? noop : toggleUpdateDependencyModal}
+                                onClick={isEditDependencyButtonDisabled ? noop : handleEditDependencyClick}
                             >
                                 <EditIcon className="mw-14 icon-dim-14 scn-0 dc__no-svg-fill" />
                                 Edit Dependency

src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx

@@ -361,18 +361,16 @@ export function WebhookDetailsModal({ close }: WebhookDetailType) {
 
     const renderWebhookURLTokenContainer = (): JSX.Element => {
         return (
-            <div className="mb-16">
-                <div className="flexbox w-100 dc__position-rel en-2 bw-1 br-4 h-32">
-                    <CustomInput
-                        name="api-token"
-                        label={renderWebhhokTokenLabel()}
-                        placeholder="Enter API token"
-                        rootClassName="bcn-0 dc__no-border"
-                        onChange={handleTokenChange}
-                        value={tryoutAPIToken} 
-                        error={showTryoutAPITokenError && WEBHOOK_NO_API_TOKEN_ERROR}
-                    />
-                </div>
+            <div className="flexbox w-100 dc__position-rel en-2 bw-1 br-4 h-32 mb-16">
+                {renderWebhhokTokenLabel()}
+                <CustomInput
+                    name="api-token"
+                    placeholder="Enter API token"
+                    rootClassName="bcn-0 dc__no-border-imp w-100 h-32 pt-5-imp p-0-8-imp"
+                    onChange={handleTokenChange}
+                    value={tryoutAPIToken}
+                    error={showTryoutAPITokenError && WEBHOOK_NO_API_TOKEN_ERROR}
+                />
             </div>
         )
     }

src/components/deploymentGroups/BulkActionEdit.tsx

@@ -400,7 +400,7 @@ function TitledCard({ number, completed = false, title, next, onClick, children
             <div className={`title-container ${completed ? 'active' : ''}`}>
                 <div className="index flex">{number}</div>
                 <div className="title flex left cn-9">{title}</div>
-                <div className="next flex">{completed && typeof next === 'function' && <button className="cta" onClick={next} type="button">Next</button>}</div>
+                <div className="next flex">{completed && typeof next === 'function' && <button className="cta flex" onClick={next} type="button">Next</button>}</div>
             </div>
             {children}
         </div>

src/components/material/MaterialView.tsx

@@ -395,9 +395,9 @@ export class MaterialView extends Component<MaterialViewProps, MaterialViewState
 
     renderGitRepoUrlLabel = (): JSX.Element => {
         return (
-            <label className="form__label">
+            <>
                 Git Repo URL<span className="cr-5">* </span>(use {this.gitAuthType('host')})
-            </label>
+            </>
         )
     }
 

src/css/base.scss

@@ -3421,6 +3421,10 @@ textarea,
     padding: 6px 12px !important;
 }
 
+.p-0-8-imp {
+    padding: 0px 8px !important;
+}
+
 // Margin in pixels
 .dc__m-auto {
     margin: auto;