Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions src-ts/lib/form/Form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ interface FormProps<ValueType, RequestType> {
readonly onChange?: (inputs: ReadonlyArray<FormInputModel>) => void,
readonly onSuccess?: () => void
readonly requestGenerator: (inputs: ReadonlyArray<FormInputModel>) => RequestType
readonly resetFormAfterSave?: boolean
readonly resetFormOnUnmount?: boolean
readonly save: (value: RequestType) => Promise<void>
}
Expand Down Expand Up @@ -120,16 +121,21 @@ const Form: <ValueType extends any, RequestType extends any>(props: FormProps<Va
setFormDef({ ...formDef })
setInputs(formGetInputFields(formDef.groups || []))
setFormKey(Date.now())
setFormError(undefined)
}

async function onSubmitAsync(event: FormEvent<HTMLFormElement>): Promise<void> {
const values: RequestType = props.requestGenerator(inputs)
formOnSubmitAsync<RequestType>(props.action || 'submit', event, formDef, values, props.save, props.onSuccess)
.then(() => {
setFormKey(Date.now())
formOnReset(inputs, props.formValues)
setFormDef({ ...formDef })
setInputs(formGetInputFields(formDef.groups || []))
if (!props.resetFormAfterSave) {
setFormKey(Date.now())
formOnReset(inputs, props.formValues)
setFormDef({ ...formDef })
setInputs(formGetInputFields(formDef.groups || []))
} else {
onReset()
}
})
.catch((error: string | undefined) => {
setFormError(error)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,10 @@
margin-left: calc(-1 * $border);
overflow: hidden;
padding: $border;
}

&::placeholder {
color: $black-60;
opacity: 1;
text-transform: none;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const BadgeCreatedModal: FC<BadgeCreatedModalProps> = (props: BadgeCreatedModalP
<Button
label='Create a new badge'
buttonStyle='secondary'
onClick={() => window.location.reload()}
onClick={onClose}
/>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const CreateBadgeForm: FC<CreateBadgeFormProps> = (props: CreateBadgeFormProps)
<Form
formDef={props.formDef}
requestGenerator={generateRequest}
resetFormAfterSave={true}
resetFormOnUnmount={true}
save={saveAsync}
/>
Expand Down