Skip to content

UI 1817 disable create target name space if name space is flux system #1856

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.

Sign up for GitHub

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 6 commits into from
Nov 10, 2022
Merged

UI 1817 disable create target name space if name space is flux system #1856

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da839f4
disable create target namespace if namespace is flux-system
Nov 9, 2022
c85647e
reset target namespace checkbox to false if target namespace is flux-…
Nov 9, 2022
d2b2bde
remove console
Nov 9, 2022
3355caf
Merge branch 'main' into UI-1817-DisableCreateTargetNameSpaceIfNameSp…
ahussein3 Nov 10, 2022
80d005f
Merge branch 'main' into UI-1817-DisableCreateTargetNameSpaceIfNameSp…
AlinaGoaga Nov 10, 2022
6f897c1
refactor If condition to be more maintainable
Nov 10, 2022
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
53 changes: 37 additions & 16 deletions ui-cra/src/components/Applications/Add/form/Partials/AppFields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ const AppFields: FC<{
...automation,
[fieldName as string]: value,
};
if (fieldName === 'target_namespace' && value === 'flux-system') {
currentAutomation[index] = {
...currentAutomation[index],
createNamespace: false,
};
}

setFormData({
...formData,
Expand Down Expand Up @@ -324,23 +330,38 @@ const AppFields: FC<{
</>
) : null}
{formData.source_type === 'GitRepository' || !clusters ? (
<Flex align={true}>
<FormControlLabel
value="top"
control={
<Checkbox
// Restore default paddingLeft for checkbox that is removed by the global style
// mui.FormControlLabel does some negative margin to align the checkbox with the label
style={{ paddingLeft: 9, marginRight: theme.spacing.small }}
checked={createNamespace}
onChange={handleCreateNamespace}
inputProps={{ 'aria-label': 'controlled' }}
color="primary"
<Tooltip
title={'flux-system will already exist in the target cluster'}
placement="top-start"
disabled={
formData.clusterAutomations[index].target_namespace !==
'flux-system'
}
>
<div>
<Flex align={true}>
<FormControlLabel
value="top"
control={
<Checkbox
// Restore default paddingLeft for checkbox that is removed by the global style
// mui.FormControlLabel does some negative margin to align the checkbox with the label
style={{ paddingLeft: 9, marginRight: theme.spacing.small }}
checked={createNamespace}
onChange={handleCreateNamespace}
inputProps={{ 'aria-label': 'controlled' }}
color="primary"
disabled={
formData.clusterAutomations[index].target_namespace ===
'flux-system'
}
/>
}
label="Create target namespace for kustomization"
/>
}
label="Create target namespace for kustomization"
/>
</Flex>
</Flex>
</div>
</Tooltip>
) : null}
</AppFieldsWrapper>
);
Expand Down