Merge branch 'main' into feat/argo-timeline

Author: AbhishekA1509

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.0.45",
+        "@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",
@@ -46,13 +46,13 @@
         "react-virtualized": "^9.22.3",
         "recharts": "^2.1.9",
         "rxjs": "^7.5.4",
+        "tippy.js": "^6.3.7",
         "xterm": "^4.19.0",
         "xterm-addon-fit": "^0.5.0",
         "xterm-addon-search": "^0.9.0",
         "xterm-webfont": "^2.0.0",
         "yaml": "^1.7.2",
-        "yamljs": "^0.3.0",
-        "tippy.js": "^6.3.7"
+        "yamljs": "^0.3.0"
     },
     "scripts": {
         "lint": "eslint src/**/*.tsx",

src/assets/icons/ic-login-dt-with-hat.svg

@@ -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/assets/icons/ic-sidebar-dt-with-hat.svg

@@ -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/AppGroup.service.ts

@@ -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/AppGroup.types.ts

@@ -103,7 +103,6 @@ export default function BulkSourceChange({ closePopup, responseList, changeBranc
                 <div className="form__row">
                     <CustomInput
                         labelClassName="dc__required-field"
-                        autoComplete="off"
                         name="branch_name"
                         disabled={false}
                         value={branchName}

src/components/ApplicationGroup/Details/EnvCIDetails/EnvCIDetails.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/ApplicationGroup/Details/TriggerView/BulkSourceChange.tsx

@@ -4,11 +4,10 @@ import { ReactComponent as Add } from '../../assets/icons/ic-add.svg'
 import { ReactComponent as QuestionIcon } from '../v2/assets/icons/ic-question.svg'
 import { ReactComponent as HelpIcon } from '../../assets/icons/ic-help.svg'
 import CIConfig from '../ciConfig/CIConfig'
-import { deepEqual } from '../common'
 import { ComponentStates } from '../EnvironmentOverride/EnvironmentOverrides.type'
 import { AdvancedConfigOptionsProps, CIConfigParentState } from '../ciConfig/types'
 import { DockerConfigOverrideKeys } from '../ciPipeline/types'
-import { CIBuildConfigType, CIBuildType, noop, TippyCustomized, TippyTheme } from '@devtron-labs/devtron-fe-common-lib'
+import { CIBuildConfigType, CIBuildType, CustomInput, noop, TippyCustomized, TippyTheme } from '@devtron-labs/devtron-fe-common-lib'
 import { getTargetPlatformMap } from '../ciConfig/CIConfig.utils'
 import TargetPlatformSelector from '../ciConfig/TargetPlatformSelector'
 import { OptionType } from '../app/types'
@@ -18,7 +17,6 @@ import { pipelineContext } from '../workflowEditor/workflowEditor'
 
 export default function AdvancedConfigOptions({
     ciPipeline,
-    setDockerConfigOverridden,
 }: AdvancedConfigOptionsProps) {
     const {
         formData,
@@ -151,9 +149,6 @@ export default function AdvancedConfigOptions({
 
         // set updated form data
         setFormData(_form)
-
-        // Check for diff in global & current CI config and set isDockerConfigOverridden flag accordingly
-        setDockerConfigOverridden(!deepEqual(_form.dockerConfigOverride, parentState.defaultDockerConfigs))
     }
 
     const renderDockerArgs = () => {
@@ -186,9 +181,10 @@ export default function AdvancedConfigOptions({
                         return (
                             <div className="flexbox justify-space" key={`build-${index}`}>
                                 <div className="mt-8 w-100">
-                                    <input
+                                    <CustomInput
+                                        name="arg-key"
                                         data-testid={`docker-arg-key-${index}`}
-                                        className="w-100 dc__top-radius-4 pl-10 pr-10 pt-6 pb-6 en-2 bw-1"
+                                        rootClassName="w-100 dc__top-radius-4 pl-10 pr-10 pt-6 pb-6 en-2 bw-1"
                                         autoComplete="off"
                                         placeholder="Key"
                                         type="text"

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

@@ -3,7 +3,7 @@ import { SourceTypeMap, ViewType } from '../../config'
 import { createWebhookConditionList } from '../ciPipeline/ciPipeline.service'
 import { SourceMaterials } from '../ciPipeline/SourceMaterials'
 import { ValidationRules } from '../ciPipeline/validationRules'
-import { Progressing, Toggle, CiPipelineSourceTypeOption } from '@devtron-labs/devtron-fe-common-lib'
+import { Progressing, Toggle, CiPipelineSourceTypeOption, CustomInput } from '@devtron-labs/devtron-fe-common-lib'
 import { BuildType, WebhookCIProps } from '../ciPipeline/types'
 import { ReactComponent as AlertTriangle } from '../../assets/icons/ic-alert-triangle.svg'
 import { ReactComponent as BugScanner } from '../../assets/icons/scanner.svg'
@@ -16,7 +16,6 @@ export function Build({
     ciPipeline,
     pageState,
     isSecurityModuleInstalled,
-    setDockerConfigOverridden,
     isJobView,
     getPluginData,
 }: BuildType) {
@@ -202,23 +201,19 @@ export function Build({
     const renderPipelineName = () => {
         return (
             <label className="form__row">
-                <span className="form__label dc__required-field">Pipeline Name</span>
-                <input
-                    className="form__input"
+                <CustomInput
+                    name="name"
+                    label="Pipeline Name"
                     data-testid="build-pipeline-name-textbox"
                     autoComplete="off"
                     disabled={!!ciPipeline?.id}
                     placeholder="e.g. my-first-pipeline"
                     type="text"
                     value={formData.name}
                     onChange={handlePipelineName}
+                    isRequiredField={true}
+                    error={formDataErrorObj.name && !formDataErrorObj.name.isValid && formDataErrorObj.name.message}
                 />
-                {formDataErrorObj.name && !formDataErrorObj.name.isValid && (
-                    <span className="flexbox cr-5 mt-4 fw-5 fs-11 flexbox">
-                        <AlertTriangle className="icon-dim-14 mr-5 ml-5 mt-2" />
-                        <span>{formDataErrorObj.name.message}</span>
-                    </span>
-                )}
             </label>
         )
     }
@@ -265,7 +260,6 @@ export function Build({
                     {isSecurityModuleInstalled && renderScanner()}
                     <AdvancedConfigOptions
                         ciPipeline={ciPipeline}
-                        setDockerConfigOverridden={setDockerConfigOverridden}
                     />
                 </>
             )}