Skip to content

Commit e3b19a1

Browse files
committed
Merge branch 'develop' into feat/mandatory-tags-v2
2 parents f915c25 + 6433a45 commit e3b19a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+979
-147
lines changed

package-lock.json

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.2.11",
3+
"version": "1.2.17",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",
@@ -108,6 +108,7 @@
108108
},
109109
"overrides": {
110110
"cross-spawn": "^7.0.5",
111+
"nanoid": "^3.3.8",
111112
"react-dates": {
112113
"react": "^17.0.2",
113114
"react-dom": "^17.0.2"

src/Assets/Icon/ic-cloud-upload.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/Icon/ic-file-code.svg

Lines changed: 2 additions & 2 deletions
Loading

src/Assets/Icon/ic-medal.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/Icon/ic-stamp.svg

Lines changed: 2 additions & 4 deletions
Loading

src/Assets/Icon/ic-tilde.svg

Lines changed: 3 additions & 0 deletions
Loading

src/Assets/Icon/ic-var-initial.svg

Lines changed: 25 additions & 0 deletions
Loading

src/Assets/Icon/ic-visibility-on.svg

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/Common/CIPipeline.Types.ts

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17+
import { DynamicDataTableCellValidationState } from '@Shared/Components'
18+
1719
export interface MaterialType {
1820
name: string
1921
type: string
@@ -97,11 +99,34 @@ export enum RefVariableStageType {
9799
POST_CI = 'POST_CI',
98100
}
99101

102+
export interface FilePropertyType {
103+
allowedExtensions: string[]
104+
maxUploadSize: number
105+
}
106+
107+
export interface ConstraintType {
108+
fileProperty: FilePropertyType
109+
}
110+
111+
export interface ValueConstraintType {
112+
choices?: string[]
113+
blockCustomValue?: boolean
114+
constraint?: ConstraintType
115+
}
116+
117+
export enum VariableTypeFormat {
118+
STRING = 'STRING',
119+
NUMBER = 'NUMBER',
120+
BOOL = 'BOOL',
121+
DATE = 'DATE',
122+
FILE = 'FILE',
123+
}
124+
100125
export interface VariableType {
101126
id: number
102127
name: string
103128
value: string
104-
format: string
129+
format: VariableTypeFormat
105130
description: string
106131
defaultValue: string
107132
allowEmptyValue: boolean
@@ -110,6 +135,12 @@ export interface VariableType {
110135
refVariableName: string
111136
refVariableStage?: RefVariableStageType
112137
variableStepIndexInPlugin?: number
138+
fileMountDir: string
139+
fileReferenceId?: number
140+
valueConstraintId?: number
141+
valueConstraint?: ValueConstraintType
142+
isRuntimeArg: boolean
143+
refVariableUsed: boolean
113144
}
114145

115146
interface CommandArgsMap {
@@ -260,11 +291,30 @@ export interface ErrorObj {
260291
isValid: boolean
261292
message: string | null
262293
}
294+
295+
export enum InputOutputVariablesHeaderKeys {
296+
VARIABLE = 'variable',
297+
FORMAT = 'format',
298+
VALUE = 'val',
299+
}
300+
301+
export type InputOutputVariablesErrorObj = Record<InputOutputVariablesHeaderKeys, DynamicDataTableCellValidationState>
302+
263303
export interface TaskErrorObj {
264304
isValid: boolean
265305
name: ErrorObj
266-
inlineStepDetail?: { inputVariables?: ErrorObj[]; outputVariables?: ErrorObj[] }
267-
pluginRefStepDetail?: { inputVariables?: ErrorObj[]; outputVariables?: ErrorObj[] }
306+
inlineStepDetail?: {
307+
inputVariables?: Record<number, InputOutputVariablesErrorObj>
308+
outputVariables?: Record<number, InputOutputVariablesErrorObj>
309+
isInputVariablesValid?: boolean
310+
isOutputVariablesValid?: boolean
311+
}
312+
pluginRefStepDetail?: {
313+
inputVariables?: Record<number, InputOutputVariablesErrorObj>
314+
outputVariables?: Record<number, InputOutputVariablesErrorObj>
315+
isInputVariablesValid?: boolean
316+
isOutputVariablesValid?: boolean
317+
}
268318
}
269319
export interface FormErrorObjectType {
270320
name: ErrorObj

0 commit comments

Comments
 (0)