feat: git repo url handling

src/Pages/App/Configurations/WorkflowEditor/CreateCICDPipeline/CIStepperContent.tsx

@@ -162,7 +162,7 @@
                 <InfoBlock variant="success" description="Build pipeline is created" size={ComponentSizeType.medium} />
             )}
             {materials.map((material, index) => {
-                const { id, name, type, isRegex, value, regex, gitMaterialId } = material
+                const { id, name, type, isRegex, value, regex, gitMaterialId, url } = material
 
                 const isBranchRegex = type === SourceTypeMap.BranchRegex || isRegex
                 const isBranchFixed = type === SourceTypeMap.BranchFixed && !isRegex
@@ -183,6 +183,7 @@
                     <Fragment key={id}>
                         <SourceMaterialsSelector
                             repoName={name}
+                            gitURL={url}
                             sourceTypePickerProps={{
                                 inputId: 'ci-pipeline-sourceType',
                                 label: 'Source Type',

src/Pages/App/Configurations/WorkflowEditor/SourceMaterialsSelector/SourceMaterialsSelector.tsx

@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 
-import { ComponentSizeType, CustomInput, Icon, SelectPicker } from '@devtron-labs/devtron-fe-common-lib'
+import { ComponentSizeType, CustomInput, GitProviderIcon, SelectPicker } from '@devtron-labs/devtron-fe-common-lib'
 
 import { SourceMaterialsSelectorProps } from './types'
 
 export const SourceMaterialsSelector = ({
     repoName,
     sourceTypePickerProps,
     branchInputProps,
+    gitURL,
 }: SourceMaterialsSelectorProps) => (
     <div className="flexbox-col dc__gap-8">
         {repoName && (
             <div className="flex left dc__gap-8">
-                <Icon name="ic-git" color={null} size={24} />
+                <GitProviderIcon gitRepoUrl={gitURL} size={24} />
                 <p className="m-0 fs-13 lh-20 fw-6 cn-9 dc__truncate">{repoName}</p>
             </div>
         )}

src/Pages/App/Configurations/WorkflowEditor/SourceMaterialsSelector/types.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { CustomInputProps, SelectPickerProps } from '@devtron-labs/devtron-fe-common-lib'
+import { CustomInputProps, MaterialType, SelectPickerProps } from '@devtron-labs/devtron-fe-common-lib'
 
 export interface SourceMaterialsSelectorProps {
     repoName?: string
@@ -25,4 +25,5 @@
     branchInputProps: Omit<CustomInputProps, 'required' | 'type'> & {
         hideInput?: boolean
     }
+    gitURL?: MaterialType['url']
 }

src/components/CIPipelineN/Build.tsx

@@ -55,12 +55,14 @@
                             ...mat,
                             value: '',
                             regex: event.target.value,
+                            gitURL: mat?.url,
                         }
                     }
                     return {
                         ...mat,
                         regex: '',
                         value: event.target.value,
+                        gitURL: mat?.url,
                     }
                 }
                 return mat

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

@@ -20,7 +20,6 @@ import {
     getCITriggerInfo,
     getParsedCIMaterialInfo,
     GitProviderIcon,
-    GitProviderType,
     Icon,
     LoadingCard,
     useQuery,
@@ -77,7 +76,7 @@ const DeployedCommitCard = ({ cardLoading, showCommitInfoDrawer, envId, ciArtifa
                                     </div>
                                 </div>
                             </div>
-                            <GitProviderIcon gitProvider={GitProviderType.GIT} size={24} />
+                            <GitProviderIcon gitRepoUrl={lastCommit?.commitURL} size={24} />
                             {/* @TODO: This should be dynamic, dependent on the source */}
                             {/* <GitHub className="github-icon" /> */}
                         </div>

src/components/ciPipeline/SourceMaterials.tsx

@@ -141,6 +141,7 @@
                                         ).message,
                                     autoFocus: index === 0,
                                 }}
+                                gitURL={mat?.url}
                             />
                             {isBranchRegex && (
                                 <InfoBlock description="Branch Regex allows you to easily switch between branches matching the configured regex before triggering the build pipeline." />

src/components/ciPipeline/ciPipeline.service.ts

@@ -135,7 +135,7 @@
     isTemplateView: AppConfigProps['isTemplateView'],
 ): Promise<any> {
     return getSourceConfig(appId, queryParams, isTemplateView).then((response) => {
-        const materials = response?.result?.material?.map((mat) => {
+        const materials: MaterialType[] = response?.result?.material?.map((mat: MaterialType) => {
             return {
                 id: 0,
                 gitMaterialId: mat.id,
@@ -146,6 +146,7 @@
                 gitMaterialName: mat.name,
                 gitProviderId: mat.gitProviderId,
                 gitHostId: 0,
+                url: mat.url,
             }
         })
         const _baseCiPipelineSourceTypeOptions = CiPipelineSourceTypeBaseOptions.map((obj) => ({ ...obj }))
@@ -241,6 +242,7 @@
             },
         ]) => {
             const ciPipeline = ciPipelineRes?.result
+            console.log('pipelineMetaConfig from getPipelineMetaConfiguration', pipelineMetaConfig)
             const pipelineMetaConfigResult = pipelineMetaConfig?.result
             return parseCIResponse(
                 pipelineMetaConfig.code,
@@ -348,8 +350,6 @@
     gitMaterials,
     appId: number,
     workflowId: number,
-    isExternalCI: boolean,
-    webhookConditionList,
     isTemplateView: AppConfigProps['isTemplateView'],
 ) {
     const updatedCI = {
@@ -456,6 +456,7 @@
                     gitHostId: gitHost ? gitHost.id : 0,
                     regex: mat.source.regex,
                     isRegex: mat.isRegex,
+                    url: mat.url || gitMaterials[0].url, // Required BE support till then will be getting url from another api
                 }
             }) || []
     }
@@ -477,6 +478,7 @@
                 gitHostId: mat.gitHostId,
                 gitProviderId: mat.gitProviderId,
                 isRegex: mat.isRegex,
+                url: mat.url,
             })
         }
     }
@@ -563,14 +565,15 @@
 function parseCIResponse(
     responseCode: number,
     ciPipeline,
-    gitMaterials,
+    gitMaterials: MaterialType[],
     gitHost,
     webhookEvents,
     ciPipelineSourceTypeOptions,
     isBlobStorageConfigured?: boolean,
     isSecurityModuleInstalled?: boolean,
     appWorkflowId?: number,
 ) {
+    console.log('gitMaterials', gitMaterials)
     if (ciPipeline) {
         if (ciPipeline.beforeDockerBuildScripts) {
             ciPipeline.preBuildStage = migrateOldData(ciPipeline.beforeDockerBuildScripts)