refactor: ci/cd pipeline services, types, FileUpload - remove className support

Author: RohitRaj011

src/Common/CIPipeline.Types.ts

@@ -97,19 +97,19 @@ export enum RefVariableStageType {
     POST_CI = 'POST_CI',
 }
 
-export interface FileProperty {
+export interface FilePropertyType {
     allowedExtensions: string[]
     maxUploadSize: number
 }
 
-export interface Constraint {
-    fileProperty: FileProperty
+export interface ConstraintType {
+    fileProperty: FilePropertyType
 }
 
-export interface ValueConstraint {
+export interface ValueConstraintType {
     choices: string[]
     blockCustomValue: boolean
-    constraint: Constraint
+    constraint: ConstraintType
 }
 
 export enum VariableTypeFormat {
@@ -136,7 +136,7 @@ export interface VariableType {
     fileMountDir: string
     fileReferenceId: number
     valueConstraintId: number
-    valueConstraint: ValueConstraint
+    valueConstraint: ValueConstraintType
     isRuntimeArg: boolean
     refVariableUsed: boolean
 }

src/Pages/Applications/DevtronApps/Details/CDPipeline/services.ts

@@ -3,7 +3,7 @@ import { MutableRefObject } from 'react'
 import { getIsRequestAborted, post } from '@Common/Api'
 import { ROUTES } from '@Common/Constants'
 import { getUrlWithSearchParams, showError } from '@Common/Helper'
-import { UploadFileDTO } from '@Shared/types'
+import { UploadFileDTO, UploadFileProps } from '@Shared/types'
 
 export const uploadCDPipelineFile = async ({
     file,
@@ -12,12 +12,9 @@ export const uploadCDPipelineFile = async ({
     allowedExtensions,
     maxUploadSize,
     abortControllerRef,
-}: {
-    file: File[]
+}: UploadFileProps & {
     appId: number
     envId: number
-    allowedExtensions?: string[]
-    maxUploadSize?: number
     abortControllerRef?: MutableRefObject<AbortController>
 }): Promise<UploadFileDTO> => {
     const formData = new FormData()
@@ -36,10 +33,9 @@ export const uploadCDPipelineFile = async ({
 
         return result
     } catch (err) {
-        if (getIsRequestAborted(err)) {
-            return null
+        if (!getIsRequestAborted(err)) {
+            showError(err)
         }
-        showError(err)
         throw err
     }
 }

src/Pages/Applications/DevtronApps/Details/CIPipeline/services.ts

@@ -39,10 +39,9 @@ export const uploadCIPipelineFile = async ({
 
         return result
     } catch (err) {
-        if (getIsRequestAborted(err)) {
-            return null
+        if (!getIsRequestAborted(err)) {
+            showError(err)
         }
-        showError(err)
         throw err
     }
 }

src/Shared/Components/DynamicDataTable/DynamicDataTableRow.tsx

@@ -181,10 +181,9 @@ export const DynamicDataTableRow = <K extends string, CustomStateType = Record<s
                 )
             case DynamicDataTableRowDataType.FILE_UPLOAD:
                 return (
-                    <div className="w-100 h-100 flex top left">
+                    <div className={`w-100 h-100 flex top left px-8 min-w-0 ${row.data[key].value ? 'py-3' : 'py-8'}`}>
                         <FileUpload
                             {...row.data[key].props}
-                            className={`px-8 min-w-0 ${row.data[key].value ? 'py-3' : 'py-8'}`}
                             fileName={row.data[key].value}
                             onUpload={onChange(row, key)}
                         />

src/Shared/Components/FileUpload/FileUpload.tsx

@@ -1,19 +1,12 @@
 import { ChangeEvent } from 'react'
 
 import { ReactComponent as ICCloudUpload } from '@Icons/ic-cloud-upload.svg'
-import { ReactComponent as ICClose } from '@Icons/ic-close.svg'
+import { ReactComponent as ICCross } from '@Icons/ic-cross.svg'
 import { Tooltip } from '@Common/Tooltip'
 
 import { FileUploadProps } from './types'
 
-export const FileUpload = ({
-    label,
-    fileName = '',
-    multiple = false,
-    fileTypes = [],
-    className,
-    onUpload,
-}: FileUploadProps) => {
+export const FileUpload = ({ label, fileName = '', multiple = false, fileTypes = [], onUpload }: FileUploadProps) => {
     // METHODS
     const handleFileChange = (event: ChangeEvent<HTMLInputElement>) => {
         if (event.target.files) {
@@ -25,8 +18,12 @@ export const FileUpload = ({
         e.target.value = ''
     }
 
+    const onClearUpload = () => {
+        onUpload([])
+    }
+
     return (
-        <div className={className || ''}>
+        <div>
             {fileName ? (
                 <div className="dc__border br-4 dc__overflow-hidden flexbox">
                     <div className="flexbox dc__align-items-center dc__gap-8 px-8 py-4 min-w-0">
@@ -35,12 +32,8 @@ export const FileUpload = ({
                             <span className="fs-12 lh-20 dc__ellipsis-right">{fileName}</span>
                         </Tooltip>
                     </div>
-                    <button
-                        type="button"
-                        className="dc__transparent flex p-6 dc__hover-n50"
-                        onClick={() => onUpload([])}
-                    >
-                        <ICClose className="icon-dim-16 fcn-6" />
+                    <button type="button" className="dc__transparent flex p-6 dc__hover-n50" onClick={onClearUpload}>
+                        <ICCross className="icon-dim-16 fcn-6" />
                     </button>
                 </div>
             ) : (

src/Shared/Components/FileUpload/types.ts

@@ -3,7 +3,6 @@ export interface FileUploadProps {
     onUpload: (files: File[]) => void
     multiple?: boolean
     label?: string
-    className?: string
     // Array of allowed MIME types (e.g., ["image/png", "image/jpeg"])
     fileTypes?: string[]
 }

src/Shared/types.ts

@@ -24,7 +24,7 @@ import {
     DeploymentAppTypes,
     ServerErrors,
     SortingParams,
-    ValueConstraint,
+    ValueConstraintType,
     VariableType,
     RefVariableType,
     PluginType,
@@ -342,7 +342,7 @@ export interface GitTriggers {
 export interface RuntimePluginVariables
     extends Pick<VariableType, 'name' | 'value' | 'format' | 'fileReferenceId' | 'fileMountDir'> {
     variableStepScope: string
-    valueConstraint: ValueConstraint & { id: number }
+    valueConstraint: ValueConstraintType & { id: number }
     stepVariableId: number
     valueType: RefVariableType
     stepName: string