github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(git): fix more files form error [EE-5125] (#8601)

pull/8617/head
Chaim Lev-Ari 2023-03-07 23:44:26 +02:00 committed by GitHub
parent e3299eddd5
commit 5f0af62521
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/react/portainer/gitops/AdditionalFilesField.tsx
View File

@ -35,8 +35,8 @@ function Item({
const { ref, updateCaret } = useCaretPosition(); const { ref, updateCaret } = useCaretPosition();
return ( return (
<> <div className="relative flex flex-col">
<InputGroup size="small" className="col-sm-5"> <InputGroup size="small">
<InputGroup.Addon>path</InputGroup.Addon> <InputGroup.Addon>path</InputGroup.Addon>
<InputGroup.Input <InputGroup.Input
mRef={ref} mRef={ref}
@ -50,7 +50,11 @@ function Item({
}} }}
/> />
</InputGroup> </InputGroup>
{error && <FormError>{error}</FormError>} {error && (
</> <div className="absolute -bottom-7">
<FormError>{error}</FormError>
</div>
)}
</div>
); );
} }

2
app/react/portainer/gitops/GitForm.tsx
View File

@ -133,7 +133,7 @@ export function buildGitValidationSchema(
ComposeFilePathInRepository: string().required( ComposeFilePathInRepository: string().required(
'Compose file path is required' 'Compose file path is required'
), ),
AdditionalFiles: array(string().required()).default([]), AdditionalFiles: array(string().required('Path is required')).default([]),
RepositoryURLValid: boolean().default(false), RepositoryURLValid: boolean().default(false),
AutoUpdate: autoUpdateValidation().nullable(), AutoUpdate: autoUpdateValidation().nullable(),
}).concat(gitAuthValidation(gitCredentials)); }).concat(gitAuthValidation(gitCredentials));