Skip to content

fix:validation around pipelineType #1626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/components/CIPipelineN/CIPipeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -602,12 +602,15 @@ export default function CIPipeline({
if (!isJobView) {
let ciPipelineType: CIPipelineBuildType = CIPipelineBuildType.CI_BUILD
if (ciPipeline.isExternal) {
ciPipelineType = CIPipelineBuildType.CI_EXTERNAL
ciPipelineType = CIPipelineBuildType.CI_LINKED
} else if (isJobCI) {
ciPipelineType = CIPipelineBuildType.CI_JOB
}
_ciPipeline.pipelineType = ciPipeline.id ? ciPipeline.pipelineType : ciPipelineType
}
if (isJobView){
_ciPipeline.pipelineType= CIPipelineBuildType.NORMAL_JOB
}
saveCIPipeline(
{
...formData,
Expand Down
2 changes: 1 addition & 1 deletion src/components/ciPipeline/LinkedCIPipelineEdit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export default class LinkedCIPipeline extends Component<CIPipelineProps, LinkedC
}
this.setState({ loadingData: true })
const parentCIPipeline = this.state.ciPipelines.find((ci) => ci.id === this.state.form.parentCIPipelineId)
parentCIPipeline.pipelineType = CIPipelineBuildType.CI_EXTERNAL
parentCIPipeline.pipelineType = CIPipelineBuildType.CI_LINKED
const params = {
appId: +this.props.match.params.appId,
workflowId: +this.props.match.params.workflowId,
Expand Down
3 changes: 2 additions & 1 deletion src/components/ciPipeline/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ export interface PreBuildType {
export enum CIPipelineBuildType {
CI_JOB = 'CI_JOB',
CI_BUILD = 'CI_BUILD',
CI_EXTERNAL = 'CI_EXTERNAL',
CI_LINKED = 'LINKED',
LINKED_CD = 'LINKED_CD',
NORMAL_JOB='NORMAL_JOB',
}
Loading