Skip to content
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

Jump to bottom

[MRXN23-228] fix: project export loop on status actions #1427

Merged
merged 1 commit into from
Aug 7, 2023
Merged

[MRXN23-228] fix: project export loop on status actions #1427

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
81 changes: 31 additions & 50 deletions app/layout/projects/show/status/actions/done.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,29 @@
import React, { useCallback } from 'react';
import React, { useCallback, useMemo, MutableRefObject } from 'react';

import { useQueryClient } from 'react-query';

import { useRouter } from 'next/router';

// import { ScenarioSidebarTabs } from 'utils/tabs';
// import { mergeScenarioStatusMetaData } from 'utils/utils-scenarios';

import { useSaveProject } from 'hooks/projects';
// import { useScenarios, useSaveScenario } from 'hooks/scenarios';
import { useToasts } from 'hooks/toast';

import { Job } from 'types/api/job';

export const useProjectActionsDone = () => {
const { query } = useRouter();
const { pid } = query;

const { pid } = query as { pid: string };
const queryClient = useQueryClient();

const { addToast } = useToasts();

// const { data: scenariosData } = useScenarios(pid, {
// filters: {
// projectId: pid,
// },
// });

// const scenarioMutation = useSaveScenario({
// requestConfig: {
// method: 'PATCH',
// },
// });

const projectMutation = useSaveProject({
const { mutate } = useSaveProject({
requestConfig: {
method: 'PATCH',
},
});

const onDone = useCallback(
(JOB_REF) => {
projectMutation.mutate(
(JOB_REF: MutableRefObject<Job>) => {
mutate(
{
id: `${pid}`,
data: {
Expand All @@ -66,12 +50,12 @@ export const useProjectActionsDone = () => {
}
);
},
[pid, projectMutation, addToast]
[pid, mutate, addToast]
);

const onCloneImportDone = useCallback(
(JOB_REF) => {
projectMutation.mutate(
(JOB_REF: MutableRefObject<Job>) => {
mutate(
{
id: `${pid}`,
data: {
Expand All @@ -81,10 +65,10 @@ export const useProjectActionsDone = () => {
},
},
{
onSuccess: () => {
onSuccess: async () => {
JOB_REF.current = null;
queryClient.invalidateQueries('projects');
queryClient.invalidateQueries(['scenarios', pid]);
await queryClient.invalidateQueries('projects');
await queryClient.invalidateQueries(['scenarios', pid]);
},
onError: () => {
addToast(
Expand All @@ -100,12 +84,12 @@ export const useProjectActionsDone = () => {
}
);
},
[pid, projectMutation, addToast, queryClient]
[pid, mutate, addToast, queryClient]
);

const onLegacyImportDone = useCallback(
(JOB_REF) => {
projectMutation.mutate(
(JOB_REF: MutableRefObject<Job>) => {
mutate(
{
id: `${pid}`,
data: {
Expand All @@ -115,10 +99,10 @@ export const useProjectActionsDone = () => {
},
},
{
onSuccess: () => {
onSuccess: async () => {
JOB_REF.current = null;
queryClient.invalidateQueries('projects');
queryClient.invalidateQueries(['scenarios', pid]);
await queryClient.invalidateQueries('projects');
await queryClient.invalidateQueries(['scenarios', pid]);
},
onError: () => {
addToast(
Expand All @@ -134,21 +118,18 @@ export const useProjectActionsDone = () => {
}
);
},
[
pid,
projectMutation,
addToast,
queryClient,
// scenariosData,
]
[pid, mutate, addToast, queryClient]
);

return {
default: onDone,
planningUnits: onDone,
export: onDone,
import: onCloneImportDone,
clone: onCloneImportDone,
legacy: onLegacyImportDone,
};
return useMemo(
() => ({
default: onDone,
planningUnits: onDone,
export: onDone,
import: onCloneImportDone,
clone: onCloneImportDone,
legacy: onLegacyImportDone,
}),
[onDone, onCloneImportDone, onLegacyImportDone]
);
};
3 changes: 2 additions & 1 deletion app/layout/projects/show/status/component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { useScenariosStatus } from 'hooks/scenarios';

import Button from 'components/button';
import Icon from 'components/icon';
import { Job } from 'types/api/job';

import CLOSE_SVG from 'svgs/ui/close.svg?sprite';
import PROCESSING_SVG from 'svgs/ui/processing.svg?sprite';
Expand Down Expand Up @@ -44,7 +45,7 @@ export const ProjectStatus: React.FC<ProjectStatusProps> = () => {
const TEXT_FAILURE = useProjectTextFailure(JOB_FAILURE);

// Done
const JOB_DONE_REF = useRef(null);
const JOB_DONE_REF = useRef<Job>(null);
const JOB_DONE = useProjectJobDone(JOBS, new Date(projectData?.lastModifiedAt).getTime());
const TEXT_DONE = useProjectTextDone(JOB_DONE, JOB_DONE_REF);

Expand Down
Loading