some Submit refactor

This commit is contained in:
Mateusz Tylka 2023-05-19 13:31:10 +02:00
parent ea64e06b3e
commit 70562c1f74
5 changed files with 38 additions and 32 deletions

View File

@ -27,7 +27,7 @@ const Submit = (props) => {
getTags(dispatch); getTags(dispatch);
}, []); }, []);
const challengeSubmissionSubmit = () => { const challengeSubmissionSubmit = React.useCallback(() => {
dispatch({ type: SUBMIT_ACTION.TOGGLE_SUBMISSION_LOADING }); dispatch({ type: SUBMIT_ACTION.TOGGLE_SUBMISSION_LOADING });
challengeSubmission( challengeSubmission(
props.challengeName, props.challengeName,
@ -37,26 +37,13 @@ const Submit = (props) => {
state.submissionTags, state.submissionTags,
dispatch dispatch
); );
}; }, [
props.challengeName,
const setDescription = (value) => { state.description,
dispatch({ type: SUBMIT_ACTION.SET_DESCRIPTION, payload: value }); state.repoBranch,
}; state.repoUrl,
state.submissionTags,
const setRepoUrl = (value) => { ]);
dispatch({ type: SUBMIT_ACTION.SET_REPO_URL, payload: value });
};
const setRepoBranch = (value) => {
dispatch({ type: SUBMIT_ACTION.SET_REPO_BRANCH, payload: value });
};
const updateTags = (submissionTags, tags) => {
dispatch({
type: SUBMIT_ACTION.UPDATE_TAGS,
payload: { submissionTags: submissionTags, tags: tags },
});
};
if (!state.submissionLoading) { if (!state.submissionLoading) {
return ( return (
@ -67,13 +54,30 @@ const Submit = (props) => {
<FlexColumn className="SubmitStyle__form"> <FlexColumn className="SubmitStyle__form">
<SubmitInput <SubmitInput
label="Submission description" label="Submission description"
handler={setDescription} handler={(value) => {
dispatch({ type: SUBMIT_ACTION.SET_DESCRIPTION, payload: value });
}}
/>
<SubmitInput
label="Submission repo URL"
handler={(value) => {
dispatch({ type: SUBMIT_ACTION.SET_REPO_URL, payload: value });
}}
/>
<SubmitInput
label="Submission repo branch"
handler={(value) => {
dispatch({ type: SUBMIT_ACTION.SET_REPO_BRANCH, payload: value });
}}
/> />
<SubmitInput label="Submission repo URL" handler={setRepoUrl} />
<SubmitInput label="Submission repo branch" handler={setRepoBranch} />
<TagsChoose <TagsChoose
label="Submission tags" label="Submission tags"
updateTags={updateTags} updateTags={(submissionTags, tags) => {
dispatch({
type: SUBMIT_ACTION.UPDATE_TAGS,
payload: { submissionTags: submissionTags, tags: tags },
});
}}
tags={state.tags} tags={state.tags}
submissionTags={state.submissionTags} submissionTags={state.submissionTags}
/> />

View File

@ -23,12 +23,7 @@ const TagsChoose = (props) => {
className="TagsChooseStyle__grid" className="TagsChooseStyle__grid"
onChange={(e) => props.handler(e.target.value)} onChange={(e) => props.handler(e.target.value)}
> >
<FlexRow <FlexRow className="TagsChooseStyle__tags-container">
width="100%"
height="100%"
className="TagsChooseStyle__tags-container"
gap="16px"
>
{props.submissionTags.map((tag, i) => {props.submissionTags.map((tag, i) =>
i === 0 ? tag.name : `, ${tag.name}` i === 0 ? tag.name : `, ${tag.name}`
)} )}

View File

@ -21,6 +21,7 @@ const TagsChooseStyle = styled(FlexColumn)`
} }
.TagsChooseStyle__tags-container { .TagsChooseStyle__tags-container {
width: 100%;
height: 100%; height: 100%;
justify-content: flex-start; justify-content: flex-start;
align-items: flex-start; align-items: flex-start;

View File

@ -52,7 +52,7 @@ const TagsChoosePopUp = (props) => {
)} )}
{renderTagItems(tags, toggleTagChoose, 'none')} {renderTagItems(tags, toggleTagChoose, 'none')}
</FlexColumn> </FlexColumn>
<FlexRow width="100%" gap="20px" alignmentX="flex-start"> <FlexRow className="TagsChoosePopUpStyle__buttons-container">
<Button <Button
height="32px" height="32px"
width="76px" width="76px"

View File

@ -26,6 +26,12 @@ const TagsChoosePopUpStyle = styled(FlexColumn)`
background-color: ${({ theme }) => theme.colors.green03}; background-color: ${({ theme }) => theme.colors.green03};
} }
} }
.TagsChoosePopUpStyle__buttons-container {
width: 100%;
gap: 20px;
justify-content: flex-start;
}
`; `;
export default TagsChoosePopUpStyle; export default TagsChoosePopUpStyle;