Skip to content

Commit 362f5fe

Browse files
committed
refactor: use savePipeline and deleteWorkflow from common
1 parent 60b1550 commit 362f5fe

File tree

14 files changed

+19
-53
lines changed

14 files changed

+19
-53
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "1.9.5-beta-1",
7+
"@devtron-labs/devtron-fe-common-lib": "1.9.6-beta-1",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ import {
3838
ButtonVariantType,
3939
ComponentSizeType,
4040
ButtonStyleType,
41-
noop,
4241
RuntimePluginVariables,
4342
uploadCIPipelineFile,
4443
UploadFileProps,
44+
savePipeline,
4545
} from '@devtron-labs/devtron-fe-common-lib'
4646
import Tippy from '@tippyjs/react'
4747
import { getCIPipelineURL, getParsedBranchValuesForPlugin, importComponentFromFELibrary } from '../../../common'
@@ -67,7 +67,6 @@ import {
6767
} from '../../../app/details/triggerView/types'
6868
import { EmptyView } from '../../../app/details/cicdHistory/History.components'
6969
import BranchRegexModal from '../../../app/details/triggerView/BranchRegexModal'
70-
import { savePipeline } from '../../../ciPipeline/ciPipeline.service'
7170
import { BulkCIDetailType, BulkCITriggerType } from '../../AppGroup.types'
7271
import { IGNORE_CACHE_INFO } from '../../../app/details/triggerView/Constants'
7372
import TriggerResponseModalBody, { TriggerResponseModalFooter } from './TriggerResponseModal'

src/components/CIPipelineN/CIPipeline.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@ export default function CIPipeline({
567567
}}
568568
onDelete={onClose}
569569
getWorkflows={getWorkflows}
570+
isTemplateView={isTemplateView}
570571
/>
571572
</ConditionalWrap>
572573
)

src/components/app/details/triggerView/ciMaterial.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
noop,
3232
Tooltip,
3333
DEFAULT_ROUTE_PROMPT_MESSAGE,
34+
savePipeline,
3435
} from '@devtron-labs/devtron-fe-common-lib'
3536
import { CIMaterialProps, CIMaterialState, RegexValueType } from './types'
3637
import { ReactComponent as ICInfoOutline } from '@Icons/ic-info-outline-grey.svg'
@@ -46,7 +47,6 @@ import { IGNORE_CACHE_INFO } from './Constants'
4647
import { EnvironmentList } from '../../../CIPipelineN/EnvironmentList'
4748
import { GitInfoMaterial } from '@Components/common/helpers/GitInfoMaterialCard/GitInfoMaterial'
4849
import BranchRegexModal from './BranchRegexModal'
49-
import { savePipeline } from '@Components/ciPipeline/ciPipeline.service'
5050

5151
const AllowedWithWarningTippy = importComponentFromFELibrary('AllowedWithWarningTippy')
5252
const validateRuntimeParameters = importComponentFromFELibrary(

src/components/ciPipeline/LinkedCIPipelineView.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ export default class LinkedCIPipelineView extends Component<CIPipelineProps, CIP
260260
getWorkflows={this.props.getWorkflows}
261261
showIconOnly={false}
262262
onDelete={this.onClose}
263+
isTemplateView={this.props.isTemplateView}
263264
/>
264265
</ConditionalWrap>
265266
)

src/components/ciPipeline/ciPipeline.service.ts

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import {
1818
get,
19-
post,
19+
savePipeline,
2020
MaterialType,
2121
Githost,
2222
ScriptType,
@@ -42,28 +42,6 @@ const emptyStepsData = () => {
4242
return { id: 0, steps: [] }
4343
}
4444

45-
export function savePipeline(
46-
request,
47-
{ isTemplateView, isRegexMaterial }: Required<Pick<AppConfigProps, 'isTemplateView'>> & {
48-
isRegexMaterial?: boolean
49-
},
50-
): Promise<any> {
51-
let url
52-
if (isRegexMaterial) {
53-
url = `${Routes.CI_PIPELINE_PATCH}/regex`
54-
} else {
55-
url = isTemplateView
56-
? getTemplateAPIRoute({
57-
type: GetTemplateAPIRouteType.CI_PIPELINE,
58-
queryParams: {
59-
id: request.appId,
60-
},
61-
})
62-
: `${Routes.CI_PIPELINE_PATCH}`
63-
}
64-
return post(url, request)
65-
}
66-
6745
function getCIPipelineNameSuggestion(appId: string | number, isTemplateView: AppConfigProps['isTemplateView']): Promise<any> {
6846
const URL = isTemplateView ? getTemplateAPIRoute({
6947
type: GetTemplateAPIRouteType.PIPELINE_SUGGEST_CI,

src/components/workflowEditor/ToggleCDSelectButton.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const ToggleCDSelectButton = ({
3131
deleteConfig,
3232
getWorkflows,
3333
hideDeleteButton = false,
34+
isTemplateView,
3435
}: ToggleCDSelectButtonProps) => (
3536
<div
3637
className={`${!hideDeleteButton ? 'dc__grid-rows-2' : 'flex'} ci-node__action-button dc__right-radius-8 h-100 dc__border-left-n1 w-24 dc__align-items-center`}
@@ -66,6 +67,7 @@ const ToggleCDSelectButton = ({
6667
deletePayloadConfig={deleteConfig}
6768
title={deleteConfig.pipelineName}
6869
getWorkflows={getWorkflows}
70+
isTemplateView={isTemplateView}
6971
/>
7072
)}
7173
</div>

src/components/workflowEditor/Workflow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ export class Workflow extends Component<WorkflowProps, WorkflowState> {
436436
isOffendingPipelineView={this.props.isOffendingPipelineView}
437437
appId={this.props.match.params.appId}
438438
getWorkflows={this.props.getWorkflows}
439-
439+
isTemplateView={this.props.isTemplateView}
440440
/>
441441
)
442442
}

src/components/workflowEditor/nodes/CINode.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { URLS } from '../../../config'
3333
import { getLinkedCITippyContent } from '../../../Pages/Shared/LinkedCIDetailsModal/utils'
3434
import { WorkflowProps } from '../Workflow'
3535

36-
export interface CINodeProps extends RouteComponentProps<{}>, Pick<WorkflowProps, 'isOffendingPipelineView'> {
36+
export interface CINodeProps extends RouteComponentProps<{}>, Pick<WorkflowProps, 'isOffendingPipelineView' | 'isTemplateView'> {
3737
x: number
3838
y: number
3939
width: number
@@ -213,6 +213,7 @@ export class CINode extends Component<CINodeProps> {
213213
testId={`ci-deployment-pipeline-${this.props.title}`}
214214
deleteConfig={this.deleteConfig}
215215
getWorkflows={this.props.getWorkflows}
216+
isTemplateView={this.props.isTemplateView}
216217
/>
217218
)}
218219
</div>

src/components/workflowEditor/nodes/WebhookNode.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ export const WebhookNode = ({
117117
onClickAddNode={addNewCD}
118118
testId={`webhook-deployment-pipeline-button-${id}`}
119119
hideDeleteButton
120+
isTemplateView={isTemplateView}
120121
/>
121122
)}
122123
</div>

0 commit comments

Comments
 (0)