Skip to content

Commit f942e25

Browse files
committed
feat: hide migrate to devtron in template view
1 parent d624242 commit f942e25

File tree

2 files changed

+29
-16
lines changed

2 files changed

+29
-16
lines changed

src/components/cdPipeline/CDPipeline.tsx

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,10 @@ export default function CDPipeline({
698698
}
699699

700700
// Have to enforce type like this otherwise pipeline variable would have taken type from MigrateArgoAppToCDPipelineRequiredPayloadType and would throw error in case of virtual env.
701-
const migrateToDevtronRequiredPayload: Omit<MigrateArgoAppToCDPipelineRequiredPayloadType, 'deploymentAppType'> & { deploymentAppType: DeploymentAppTypes } = isMigratingFromExternalApp
701+
const migrateToDevtronRequiredPayload: Omit<
702+
MigrateArgoAppToCDPipelineRequiredPayloadType,
703+
'deploymentAppType'
704+
> & { deploymentAppType: DeploymentAppTypes } = isMigratingFromExternalApp
702705
? getMigrateToDevtronRequiredPayload(migrateToDevtronFormState)
703706
: null
704707

@@ -956,7 +959,7 @@ export default function CDPipeline({
956959
buttonProps: getConfigureGitOpsCredentialsButtonProps({
957960
size: ComponentSizeType.small,
958961
style: ButtonStyleType.neutral,
959-
})
962+
}),
960963
})
961964

962965
return
@@ -1001,9 +1004,12 @@ export default function CDPipeline({
10011004
try {
10021005
const promiseArr = cdPipelineId
10031006
? [updateCDPipeline(request, isTemplateView), null]
1004-
: [saveCDPipeline(request, {
1005-
isTemplateView
1006-
}), isMigratingFromExternalApp ? getEnvironmentListMinPublic(true) : null]
1007+
: [
1008+
saveCDPipeline(request, {
1009+
isTemplateView,
1010+
}),
1011+
isMigratingFromExternalApp ? getEnvironmentListMinPublic(true) : null,
1012+
]
10071013
const [response, environmentRes] = await Promise.all(promiseArr)
10081014
if (response.result) {
10091015
const pipelineConfigFromRes = response.result.pipelines[0]
@@ -1371,7 +1377,10 @@ export default function CDPipeline({
13711377
// Disable button if environment or release name is not selected
13721378
const getButtonDisabledMessage = (): string => {
13731379
if (isMigratingFromExternalApp) {
1374-
const isLinkable = migrateToDevtronFormState.deploymentAppType === DeploymentAppTypes.HELM ? migrateToDevtronFormState.migrateFromHelmFormState.validationResponse.isLinkable : migrateToDevtronFormState.migrateFromArgoFormState.validationResponse.isLinkable
1380+
const isLinkable =
1381+
migrateToDevtronFormState.deploymentAppType === DeploymentAppTypes.HELM
1382+
? migrateToDevtronFormState.migrateFromHelmFormState.validationResponse.isLinkable
1383+
: migrateToDevtronFormState.migrateFromArgoFormState.validationResponse.isLinkable
13751384
if (!isLinkable) {
13761385
return 'Please resolve errors before proceeding'
13771386
}
@@ -1417,16 +1426,18 @@ export default function CDPipeline({
14171426
'data-testid': 'new-deployment-tab',
14181427
},
14191428
},
1420-
{
1421-
tabType: 'button',
1422-
active: formData.releaseMode === ReleaseMode.MIGRATE_EXTERNAL_APPS,
1423-
label: 'Migrate to Devtron',
1424-
id: ReleaseMode.MIGRATE_EXTERNAL_APPS,
1425-
props: {
1426-
onClick: handleSelectMigrateToDevtron,
1427-
'data-testid': 'migrate-to-devtron-tab',
1428-
},
1429-
},
1429+
...(isTemplateView
1430+
? []
1431+
: [{
1432+
tabType: 'button' as const,
1433+
active: formData.releaseMode === ReleaseMode.MIGRATE_EXTERNAL_APPS,
1434+
label: 'Migrate to Devtron',
1435+
id: ReleaseMode.MIGRATE_EXTERNAL_APPS,
1436+
props: {
1437+
onClick: handleSelectMigrateToDevtron,
1438+
'data-testid': 'migrate-to-devtron-tab',
1439+
},
1440+
}]),
14301441
]}
14311442
alignActiveBorderWithContainer
14321443
/>

src/css/themeUtils.scss

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

17+
@use './mixins.scss' as *;
18+
1719
.bg {
1820
&__primary {
1921
background: var(--bg-primary);

0 commit comments

Comments
 (0)