Skip to content
Open
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
5 changes: 4 additions & 1 deletion terranova/frontend/src/components/DatasetCreatorForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export function DatasetCreatorForm(props: any) {
// prefer a controlled state form over uncontrolled, because one of the inputs
// (fork from version) is dependent on a previous value (fork from dataset)
const [formValues, setFormValues] = useState<Form>({});
const [submitting, setSubmitting] = useState(false);

const setFormValue = (property: string) => (value: any) => {
setFormValues((prev) => {
Expand All @@ -48,8 +49,10 @@ export function DatasetCreatorForm(props: any) {
// get some information from the DataController (set of options for 'select' elements, e.g.)
const onSubmit = async (e: any) => {
e.preventDefault();
if (submitting) return;
if (!formValues.name) return;
if (formValues.fork && (!formValues.forkDataset || !formValues.forkDatasetVersion)) return;
setSubmitting(true);
// TODO: add form basic form validation, a lengthy process

const newDataset = structuredClone(DEFAULT_DATASET);
Expand Down Expand Up @@ -110,7 +113,7 @@ export function DatasetCreatorForm(props: any) {
/>
)}
<div className="mt-2 ml-auto w-fit">
<PktsButton variant="secondary" type="submit">
<PktsButton variant="secondary" type="submit" disabled={submitting}>
Create Dataset
</PktsButton>
</div>
Expand Down
5 changes: 4 additions & 1 deletion terranova/frontend/src/components/MapCreatorForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export function MapCreatorForm(props: any) {
// prefer a controlled state form over uncontrolled, because one of the inputs
// (fork from version) is dependent on a previous value (fork from map)
const [formValues, setFormValues] = useState<Form>({});
const [submitting, setSubmitting] = useState(false);

const setFormValue = (property: string) => (value: any) => {
setFormValues((prev) => {
Expand All @@ -47,8 +48,10 @@ export function MapCreatorForm(props: any) {

const onSubmit = async (e: any) => {
e.preventDefault();
if (submitting) return;
if (!formValues.name) return;
if (formValues.fork && (!formValues.forkMap || !formValues.forkMapVersion)) return;
setSubmitting(true);
// TODO: add form basic form validation, a lengthy process

const newMap = structuredClone(DEFAULT_MAP);
Expand Down Expand Up @@ -108,7 +111,7 @@ export function MapCreatorForm(props: any) {
/>
)}
<div className="mt-2 ml-auto w-fit">
<PktsButton variant="secondary" type="submit">
<PktsButton variant="secondary" type="submit" disabled={submitting}>
Create Map
</PktsButton>
</div>
Expand Down
17 changes: 12 additions & 5 deletions terranova/frontend/src/components/TemplateEditorForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export function TemplateEditorForm(props: any) {
const { templateId } = useParams();
const create = templateId === undefined;
const [updating, setUpdating] = useState(false);
const [submitting, setSubmitting] = useState(false);
const { controller } = useContext(TemplateDataController) as DataControllerContextType;


Expand All @@ -40,10 +41,16 @@ export function TemplateEditorForm(props: any) {
controller.fetch();
};

const save = (e: any) => {
const save = async (e: any) => {
e.preventDefault();
if (submitting) return;
setSubmitting(true);
setUpdating(false);
props.persistTemplate(e);
try {
await props.persistTemplate(e);
} finally {
setSubmitting(false);
}
};

return (
Expand All @@ -67,15 +74,15 @@ export function TemplateEditorForm(props: any) {
/>
</PktsInputRow>
{create ? (
<PktsButton onClick={save} variant="primary">
<PktsButton onClick={save} variant="primary" disabled={submitting}>
Create <Save />
</PktsButton>
) : (
<div className="flex gap-4">
<PktsButton disabled={!updating} variant="destructive" onClick={discard}>
<PktsButton disabled={!updating || submitting} variant="destructive" onClick={discard}>
Discard <X />
</PktsButton>
<PktsButton disabled={!updating} onClick={save} variant="primary">
<PktsButton disabled={!updating || submitting} onClick={save} variant="primary">
Save Changes <Save />
</PktsButton>
</div>
Expand Down
Loading