Merge branch 'main' into approval-via-email

Author: shivani170

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.0.47",
+        "@devtron-labs/devtron-fe-common-lib": "0.0.48",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
         "@rjsf/validator-ajv8": "^5.13.3",

src/components/ApplicationGroup/AppGroup.service.ts

@@ -4,15 +4,13 @@ import {
     CiPipelineResult,
     WorkflowResult,
     NodeAttr,
-    PipelineType,
-    WorkflowNodeType,
     CiPipeline,
 } from '../app/details/triggerView/types'
 import { WebhookListResponse } from '../ciPipeline/Webhook/types'
 import { processWorkflow } from '../app/details/triggerView/workflow.service'
 import { WorkflowTrigger } from '../app/details/triggerView/config'
 import { ModuleNameMap, Routes, URLS } from '../../config'
-import { get, post, put, ResponseType, trash } from '@devtron-labs/devtron-fe-common-lib'
+import { get, post, put, ResponseType, trash, WorkflowNodeType, PipelineType } from '@devtron-labs/devtron-fe-common-lib'
 import {
     AppGroupList,
     CIConfigListType,

src/components/ApplicationGroup/AppGroup.types.ts

@@ -4,9 +4,10 @@ import {
     FilterConditionsListType,
     ResponseType,
     UserApprovalConfigType,
+    WorkflowNodeType
 } from '@devtron-labs/devtron-fe-common-lib'
 import { MultiValue } from 'react-select'
-import { WebhookPayloads, WorkflowNodeType, WorkflowType } from '../app/details/triggerView/types'
+import { WebhookPayloads, WorkflowType } from '../app/details/triggerView/types'
 import { EditDescRequest, OptionType } from '../app/types'
 import { AppFilterTabs, BulkResponseStatus } from './Constants'
 

src/components/ApplicationGroup/Details/EnvCIDetails/EnvCIDetails.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { generatePath, Route, useHistory, useParams, useRouteMatch } from 'react-router-dom'
-import { Progressing, showError, sortCallback, useAsync } from '@devtron-labs/devtron-fe-common-lib'
+import { Progressing, showError, sortCallback, useAsync, PipelineType } from '@devtron-labs/devtron-fe-common-lib'
 import { URLS } from '../../../../config'
 import { APP_GROUP_CI_DETAILS } from '../../../../config/constantMessaging'
 import { EmptyView, LogResizeButton } from '../../../app/details/cicdHistory/History.components'
@@ -12,7 +12,7 @@ import {
     FetchIdDataStatus,
 } from '../../../app/details/cicdHistory/types'
 import { Details } from '../../../app/details/cIDetails/CIDetails'
-import { CiPipeline, PipelineType } from '../../../app/details/triggerView/types'
+import { CiPipeline } from '../../../app/details/triggerView/types'
 import { getTriggerHistory } from '../../../app/service'
 import { asyncWrap, mapByKey, useInterval } from '../../../common'
 import { getCIConfigList } from '../../AppGroup.service'

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

@@ -15,6 +15,7 @@ import {
     Checkbox,
     CHECKBOX_VALUE,
     VisibleModal,
+    WorkflowNodeType,
 } from '@devtron-labs/devtron-fe-common-lib'
 import CDMaterial from '../../../app/details/triggerView/cdMaterial'
 import { CIMaterial } from '../../../app/details/triggerView/ciMaterial'
@@ -24,7 +25,6 @@ import {
     CIMaterialRouterProps,
     MATERIAL_TYPE,
     NodeAttr,
-    WorkflowNodeType,
     WorkflowType,
 } from '../../../app/details/triggerView/types'
 import { Workflow } from '../../../app/details/triggerView/workflow/Workflow'

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/app/details/appConfig/AppComposeRouter.tsx

@@ -94,6 +94,7 @@ export default function AppComposeRouter({
                                 getWorkflows={getWorkflows}
                                 isJobView={isJobView}
                                 envList={environments}
+                                reloadEnvironments={reloadEnvironments}
                             />
                         )}
                     />,
@@ -192,6 +193,7 @@ export default function AppComposeRouter({
                                 respondOnSuccess={respondOnSuccess}
                                 getWorkflows={getWorkflows}
                                 filteredEnvIds={filteredEnvIds}
+                                reloadEnvironments={reloadEnvironments}
                             />
                         )}
                     />,

src/components/app/details/cIDetails/CIDetails.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useMemo } from 'react'
-import { showError, Progressing, Reload, GenericEmptyState, useAsync } from '@devtron-labs/devtron-fe-common-lib'
+import { showError, Progressing, Reload, GenericEmptyState, useAsync, PipelineType } from '@devtron-labs/devtron-fe-common-lib'
 import {
     getCIPipelines,
     getCIHistoricalStatus,
@@ -30,7 +30,6 @@ import { EMPTY_STATE_STATUS } from '../../../../config/constantMessaging'
 import { ReactComponent as NoVulnerability } from '../../../../assets/img/ic-vulnerability-not-found.svg'
 import { ScannedByToolModal } from '../../../common/security/ScannedByToolModal'
 import { CIPipelineBuildType } from '../../../ciPipeline/types'
-import { PipelineType } from '../triggerView/types'
 
 const terminalStatus = new Set(['succeeded', 'failed', 'error', 'cancelled', 'nottriggered', 'notbuilt'])
 let statusSet = new Set(['starting', 'running', 'pending'])

src/components/app/details/triggerView/config.ts

@@ -34,13 +34,13 @@ export const WorkflowCreate = {
     cINodeSizes: {
         nodeHeight: 64,
         nodeWidth: 240,
-        distanceX: 60,
+        distanceX: 100,
         distanceY: 25,
     } as NodeDimension,
     cDNodeSizes: {
         nodeHeight: 64,
         nodeWidth: 240,
-        distanceX: 60,
+        distanceX: 100,
         distanceY: 25,
     } as NodeDimension,
     workflow: {

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

@@ -16,8 +16,10 @@ import {
     TaskErrorObj,
     FilterConditionsListType,
     CDMaterialResponseType,
+    PipelineType,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { Environment } from '../../../cdPipeline/cdPipeline.types'
+import { WorkflowDimensions } from './config'
 
 export interface CDMaterialProps extends RouteComponentProps<{}> {
     material?: CDMaterialType[]
@@ -409,13 +411,6 @@ export interface ApplicationConditionResponse {
     message: string
 }
 
-export enum PipelineType {
-    CI_PIPELINE = 'CI_PIPELINE',
-    CD_PIPELINE = 'CD_PIPELINE',
-    WEBHOOK = 'WEBHOOK',
-    LINKED_CD = 'LINKED_CD',
-}
-
 export enum CIPipelineNodeType {
     EXTERNAL_CI = 'EXTERNAL-CI',
     CI = 'CI',
@@ -424,15 +419,6 @@ export enum CIPipelineNodeType {
     LINKED_CD = 'LINKED_CD',
 }
 
-export enum WorkflowNodeType {
-    GIT = 'GIT',
-    CI = 'CI',
-    WEBHOOK = 'WEBHOOK',
-    PRE_CD = 'PRECD',
-    CD = 'CD',
-    POST_CD = 'POSTCD',
-}
-
 export interface Task {
     name?: string
     type?: string
@@ -725,3 +711,10 @@ export interface MaterialSourceProps {
     fromTriggerInfo?: boolean
     clearSearch?: (e: any) => void
 }
+
+export interface AddDimensionsToDownstreamDeploymentsParams {
+    downstreams: NodeAttr[],
+    dimensions: WorkflowDimensions,
+    startX: number,
+    startY: number,
+}