Skip to content
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

ENG-3011 and ENG-3012 Kubernetes/OnDemandKubernetes Dialog Fixes #1355

Merged
merged 2 commits into from
May 23, 2023
Merged

ENG-3011 and ENG-3012 Kubernetes/OnDemandKubernetes Dialog Fixes #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
535a79f
Refactors Kubernetes and OnDemandKubernetes dialogs to fix issues wit…
May 23, 2023
737d0ee
lint
May 23, 2023
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
15 changes: 11 additions & 4 deletions src/ui/common/src/components/integrations/dialogs/kubernetesDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ export const KubernetesDialog: React.FC<KuberentesDialogProps> = ({
const { register, setValue, getValues } = useFormContext();
const use_same_cluster = getValues('use_same_cluster');

register('use_same_cluster');

useEffect(() => {
setValue('use_same_cluster', 'false');
if (!use_same_cluster) {
setValue('use_same_cluster', 'false');
}
}, []);

return (
Expand Down Expand Up @@ -81,7 +81,14 @@ export const KubernetesDialog: React.FC<KuberentesDialogProps> = ({

export function getKubernetesValidationSchema() {
return Yup.object().shape({
use_same_cluster: Yup.string(),
name: Yup.string().required('Please enter a name.'),
use_same_cluster: Yup.string().transform((value) => {
if (value === 'true') {
return 'true';
}

return 'false';
}),
kubeconfig_path: Yup.string().when('use_same_cluster', {
is: 'false',
then: Yup.string().required('Please enter a kubeconfig path'),
Expand Down
Loading