Skip to content

prevent display error saving before last page #582

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

Draft
renaud23 wants to merge 1 commit into
base: v3-master
Choose a base branch
from
Draft

prevent display error saving before last page #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 26 additions & 25 deletions src/components/navigation/Continuer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ import { Button } from '@codegouvfr/react-dsfr/Button';
import { useNavigate } from 'react-router';
import { isComponentsContainSequence } from '../../lib/commons/isComponentscontainSequence';
import { ComponentType } from '../../typeLunatic/type-source';
import { CollectStatusEnum, OrchestratedElement } from '../../typeStromae/type';
import { uri404 } from '../../lib/domainUri';
import { useSaveSurveyUnitStateData } from '../../hooks/useSaveSurveyUnitData';
import { OrchestratedElement } from '../../typeStromae/type';

function getButtonTitle(getComponents: () => Array<ComponentType>) {
if (getComponents) {
Expand Down Expand Up @@ -48,45 +46,48 @@ function getStatus(
export function Continuer(props: OrchestratedElement) {
const [saving, setSaving] = useState(false);
const {
goNextPage = () => null,
goNextPage = async () => null,
isLastPage,
getComponents = () => [],
// `waiting` is activated to communicate to users that an API request is in process
waiting = false,
pageTag,
} = props;
const navigate = useNavigate();
const saveSuData = useSaveSurveyUnitStateData();
const buttonContent =
waiting || saving
? `Chargement`
: getStatus(getComponents, isLastPage ?? false, saving);

const handleClick = useCallback(
(event: React.MouseEvent) => {
async (event: React.MouseEvent) => {
event.preventDefault();

if (isLastPage) {
setSaving(true);
saveSuData({
pageTag,
collectStatus: CollectStatusEnum.Validated,
})
.then(() => {
navigate(0);
setSaving(false);
})
.catch(() => {
navigate(uri404());
setSaving(false);
});
}

// if (isLastPage) {
// setSaving(true);
// saveSuData({
// pageTag,
// collectStatus: CollectStatusEnum.Validated,
// })
// .then(() => {
// navigate(0);
// setSaving(false);
// })
// .catch(() => {
// navigate(uri404());
// setSaving(false);
// });
// } else {
window.scrollTo(0, 0);
document.getElementById('button-precedent')?.focus();
goNextPage();
setSaving(true);
await goNextPage();
setSaving(false);
if (isLastPage) {
navigate(0);
}
// }
},
[goNextPage, isLastPage, navigate, saveSuData, pageTag]
[goNextPage, isLastPage, navigate]
);

return (
Expand Down
4 changes: 2 additions & 2 deletions src/components/orchestrator/UseLunatic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ export function UseLunatic(props: PropsWithChildren<OrchestratorProps>) {
previousPageTag !== undefined &&
previousPageTag !== pageTag;

const handleGoNext = useCallback(() => {
const handleGoNext = useCallback(async () => {
if (isLastPage) {
saveChange({ pageTag, getData });
await saveChange({ pageTag, getData, isLastPage });
} else {
shouldSync.current = true;
goNextPage?.();
Expand Down
28 changes: 24 additions & 4 deletions src/components/orchestrator/useSaving/useSaving.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@ import { CollectStatusEnum, SavingFailure } from '../../../typeStromae/type';
import { loadSourceDataContext } from '../../loadSourceData/LoadSourceDataContext';
import { useSaveSurveyUnitStateData } from '../../../hooks/useSaveSurveyUnitData';

function getCollectStatus(changing: boolean, previous: CollectStatusEnum) {
function getCollectStatus(
changing: boolean,
previous: CollectStatusEnum,
isLastPage?: boolean
) {
if (isLastPage) {
return CollectStatusEnum.Validated;
}
if (previous === CollectStatusEnum.Validated) {
return CollectStatusEnum.Validated;
}
Expand Down Expand Up @@ -34,9 +41,18 @@ export function useSaving({
}, []);

const saveChange = useCallback(
async ({ pageTag, getData }: { pageTag: string; getData: () => any }) => {
async ({
pageTag,
getData,
isLastPage,
}: {
pageTag: string;
getData: () => any;
isLastPage?: boolean;
}) => {
setFailure(undefined);
setWaiting(true);

try {
// save data
const isOnChange = changes.current.size !== 0;
Expand All @@ -58,7 +74,11 @@ export function useSaving({
// save stateData
const state = await saveSuData({
pageTag,
collectStatus: getCollectStatus(isOnChange, currentStatus),
collectStatus: getCollectStatus(
isOnChange,
currentStatus,
isLastPage
),
});
setCurrentStatus(state.state);
setWaiting(false);
Expand All @@ -67,7 +87,7 @@ export function useSaving({
setWaiting(false);
}
},
[currentStatus, putSurveyUnitData, setFailure, setWaiting, saveSuData]
[setFailure, setWaiting, saveSuData, currentStatus, putSurveyUnitData]
);

return { listenChange, saveChange };
Expand Down
Loading