Skip to content

Save button #1117

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Save button #1117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
901a12e
create new component- saveButton
Sep 14, 2025
3eeee8d
added handleSave function,replaced Standard Button with SaveButton, w…
Sep 22, 2025
3a2a231
rename the file to fit in
Sep 22, 2025
3d59dc9
Build Routine objects in handleSave for both edit and create paths.
Sep 24, 2025
7507eea
import the FormQueryErrors.
Sep 24, 2025
b2fb672
Merge branch 'master' into save-button
vilanell000 Sep 30, 2025
799bff7
Merge branch 'master' into fork/vilanell000/save-button
rolandgeider Oct 7, 2025
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
107 changes: 107 additions & 0 deletions src/components/WorkoutRoutines/widgets/SaveButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
import { Button, ButtonProps } from "@mui/material";
import React, { useEffect, useState } from 'react';
import { useTranslation } from "react-i18next";

export type SaveStatus = 'idle' | 'loading' | 'success' | 'error';

interface SaveButtonProps extends Omit<ButtonProps, 'onClick' | 'disabled'> {
onSave: () => Promise<void> | void;
saveStatus?: SaveStatus;
loadingText?: string;
successText?: string;
errorText?: string;
defaultText?: string;
resetDelay?: number;
}

export const SaveButton: React.FC<SaveButtonProps> = ({
onSave,
saveStatus: externalStatus,
loadingText,
successText,
errorText,
defaultText,
resetDelay = 1500,
...buttonProps
}) => {
const { t } = useTranslation();
const [internalStatus, setInternalStatus] = useState<SaveStatus>('idle');
const [isCoolingDown, setIsCoolingDown] = useState<boolean>(false);

const currentStatus = externalStatus || internalStatus;


const getButtonConfig = (status: SaveStatus) => {
switch (status) {
case 'loading':
return {
text: loadingText || t('saving', 'Saving...'),
disabled: true
};
case 'success':
return {
text: successText || `${t('save', 'Save')} ✅`,
disabled: true
};
case 'error':
return {
text: errorText || `${t('save', 'Save')} ❌`,
disabled: false
};
default:
return {
text: defaultText || t('save', 'Save'),
disabled: false
};
}
};

const buttonConfig = getButtonConfig(currentStatus);

const handleClick = async () => {
if (currentStatus === 'loading') return;

try {
// Start cooldown immediately on click
setIsCoolingDown(true);
const cooldownTimer = setTimeout(() => setIsCoolingDown(false), resetDelay);

if (!externalStatus) {
setInternalStatus('loading');
}

await onSave();

if (!externalStatus) {
setInternalStatus('success');
}
} catch (error) {
if (!externalStatus) {
setInternalStatus('error');
}
} finally {
// Ensure cooldown timer exists for at least resetDelay; already set above
}
};

// reset status
useEffect(() => {
if ((currentStatus === 'success' || currentStatus === 'error') && !externalStatus) {
const timer = setTimeout(() => {
setInternalStatus('idle');
}, resetDelay);

return () => clearTimeout(timer);
}
}, [currentStatus, resetDelay, externalStatus]);

return (
<Button
{...buttonProps}
disabled={buttonConfig.disabled || isCoolingDown}
onClick={handleClick}
>
{buttonConfig.text}
</Button>
);
};
56 changes: 38 additions & 18 deletions src/components/WorkoutRoutines/widgets/forms/RoutineForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ import {
} from "components/WorkoutRoutines/models/Routine";
import { useAddRoutineQuery, useEditRoutineQuery } from "components/WorkoutRoutines/queries/routines";
import { SlotEntryRoundingField } from "components/WorkoutRoutines/widgets/forms/SlotEntryForm";
import { SaveButton } from "components/WorkoutRoutines/widgets/SaveButton";
import { Form, Formik } from "formik";
import { FormQueryErrors } from "components/Core/Widgets/FormError";
import { DateTime } from "luxon";
import React, { useState } from 'react';
import { useTranslation } from "react-i18next";
Expand Down Expand Up @@ -145,18 +147,13 @@ export const RoutineForm = ({
{formik => (
<Form>
<Grid container spacing={2}>

<Grid size={{ xs: 12 }}>
<WgerTextField fieldName="name" title={t('name')} />
</Grid>
<Grid size={12}>
<WgerTextField
fieldName="description"
title={t('description')}
fieldProps={{ multiline: true, rows: 4 }}
/>
<FormQueryErrors mutationQuery={routine ? editRoutineQuery : addRoutineQuery} />
</Grid>
<Grid size={{ xs: 6 }}>
<Grid size={{ xs: 12, sm: 5 }}>
<WgerTextField fieldName="name" title={t('name')} />
</Grid>
<Grid size={{ xs: 6, sm: 3 }}>
<LocalizationProvider dateAdapter={AdapterLuxon} adapterLocale={i18n.language}>
<DatePicker
defaultValue={DateTime.now()}
Expand All @@ -179,7 +176,7 @@ export const RoutineForm = ({
/>
</LocalizationProvider>
</Grid>
<Grid size={{ xs: 5 }}>
<Grid size={{ xs: 6, sm: 3 }}>
<LocalizationProvider dateAdapter={AdapterLuxon} adapterLocale={i18n.language}>
<DatePicker
defaultValue={DateTime.now()}
Expand All @@ -203,7 +200,7 @@ export const RoutineForm = ({
</LocalizationProvider>
</Grid>
<Grid
size={{ xs: 1 }}
size={{ xs: 12, sm: 1 }}
sx={{
display: "flex",
alignItems: "center",
Expand All @@ -216,6 +213,13 @@ export const RoutineForm = ({
nrDays: durationDays
})}
</Grid>
<Grid size={12}>
<WgerTextField
fieldName="description"
title={t('description')}
fieldProps={{ multiline: true, rows: 4 }}
/>
</Grid>
<Grid size={12}>
<FormControlLabel
control={
Expand All @@ -229,14 +233,30 @@ export const RoutineForm = ({
</Tooltip>
</Grid>
<Grid size={12}>
<Button
disabled={formik.isSubmitting}
color="primary"
<SaveButton
onSave={async () => {
const errors = await formik.validateForm();
if (Object.keys(errors).length > 0) {
formik.setTouched(
Object.keys(errors).reduce((acc, key) => ({
...acc,
[key]: true
}), {})
);
throw new Error('validation error');
}

await formik.submitForm();
}}
loadingText={t('saving', 'Saving...')}
successText={`${t('save', 'Saved')} ✅`}
errorText={`${t('save')} ❌`}
defaultText={t('save')}
variant="contained"
color="primary"
type="submit"
sx={{ mt: 2 }}>
{t('save')}
</Button>
sx={{ mt: 2 }}
/>
</Grid>
</Grid>
</Form>
Expand Down