🐛 Update query when assessment is deleted

client/src/app/pages/applications/applications-table-assessment/applications-table-assessment.tsx

@@ -220,8 +220,8 @@ export const ApplicationsTable: React.FC = () => {
         await Promise.all(
           application.assessments.map(async (assessment) => {
             await deleteAssessment({
-              id: assessment.id,
-              name: application.name,
+              assessmentId: assessment.id,
+              applicationName: application.name,
             });
           })
         );

client/src/app/pages/assessment/components/assessment-actions/components/dynamic-assessment-actions-row.tsx

@@ -180,8 +180,10 @@ const DynamicAssessmentActionsRow: FunctionComponent<
       if (assessment) {
         try {
           await deleteAssessmentAsync({
-            name: assessment.name,
-            id: assessment.id,
+            assessmentId: assessment.id,
+            applicationName: application?.name,
+            applicationId: application?.id,
+            archetypeId: archetype?.id,
           }).then(() => {
             createAssessment();
           });
@@ -257,8 +259,10 @@ const DynamicAssessmentActionsRow: FunctionComponent<
             variant="plain"
             onClick={() => {
               deleteAssessment({
-                id: assessment.id,
-                name: assessment.name,
+                assessmentId: assessment.id,
+                applicationName: application?.name,
+                applicationId: application?.id,
+                archetypeId: archetype?.id,
               });
             }}
           >

client/src/app/pages/assessment/components/assessment-wizard/assessment-wizard.tsx

@@ -26,6 +26,7 @@ import {
 import { AxiosError } from "axios";
 import {
   assessmentsByItemIdQueryKey,
+  useDeleteAssessmentMutation,
   useUpdateAssessmentMutation,
 } from "@app/queries/assessments";
 import { useQueryClient } from "@tanstack/react-query";
@@ -77,12 +78,14 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
     onHandleUpdateAssessmentSuccess
   );
 
+  const { mutate: deleteAssessmentMutation } = useDeleteAssessmentMutation();
+
   const { t } = useTranslation();
 
   const [currentStep, setCurrentStep] = useState(0);
 
-  const [isConfirmDialogOpen, setIsConfirmDialogOpen] =
-    React.useState<boolean>(false);
+  const [assessmentToCancel, setAssessmentToCancel] =
+    React.useState<Assessment | null>(null);
 
   const history = useHistory();
 
@@ -509,35 +512,50 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
             onNext={() => setCurrentStep((current) => current + 1)}
             onBack={() => setCurrentStep((current) => current - 1)}
             onClose={() => {
-              setIsConfirmDialogOpen(true);
+              assessment && setAssessmentToCancel(assessment);
             }}
             onGoToStep={(step) => setCurrentStep(step.id as number)}
           />
-          {isConfirmDialogOpen && (
+          {assessmentToCancel && (
             <ConfirmDialog
               title={t("dialog.title.leavePage")}
               isOpen
               message={t("dialog.message.leavePage")}
               confirmBtnVariant={ButtonVariant.primary}
               confirmBtnLabel={t("actions.continue")}
               cancelBtnLabel={t("actions.cancel")}
-              onCancel={() => setIsConfirmDialogOpen(false)}
-              onClose={() => setIsConfirmDialogOpen(false)}
+              onCancel={() => setAssessmentToCancel(null)}
+              onClose={() => setAssessmentToCancel(null)}
               onConfirm={() => {
-                setIsConfirmDialogOpen(false);
                 if (isArchetype) {
+                  assessmentToCancel.status === "empty" &&
+                    deleteAssessmentMutation({
+                      assessmentId: assessmentToCancel.id,
+                      applicationName: assessmentToCancel.application?.name,
+                      applicationId: assessmentToCancel.application?.id,
+                      archetypeId: assessmentToCancel.archetype?.id,
+                    });
+
                   history.push(
                     formatPath(Paths.archetypeAssessmentActions, {
                       archetypeId: assessment?.archetype?.id,
                     })
                   );
                 } else {
+                  assessmentToCancel.status === "empty" &&
+                    deleteAssessmentMutation({
+                      assessmentId: assessmentToCancel.id,
+                      applicationName: assessmentToCancel.application?.name,
+                      applicationId: assessmentToCancel.application?.id,
+                      archetypeId: assessmentToCancel.archetype?.id,
+                    });
                   history.push(
                     formatPath(Paths.applicationAssessmentActions, {
                       applicationId: assessment?.application?.id,
                     })
                   );
                 }
+                setAssessmentToCancel(null);
               }}
             />
           )}

client/src/app/queries/assessments.ts

@@ -11,6 +11,7 @@
 import { AxiosError } from "axios";
 import { Assessment, InitialAssessment } from "@app/api/models";
 import { QuestionnairesQueryKey } from "./questionnaires";
+import { ARCHETYPE_QUERY_KEY } from "./archetypes";
 
 export const assessmentsQueryKey = "assessments";
 export const assessmentQueryKey = "assessment";
@@ -70,21 +71,35 @@
 };
 
 export const useDeleteAssessmentMutation = (
-  onSuccess: (name: string) => void,
-  onError: (err: AxiosError) => void
+  onSuccess?: (applicationName: string) => void,
+  onError?: (err: AxiosError) => void
 ) => {
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (args: { name: string; id: number }) =>
-      deleteAssessment(args.id),
-    onSuccess: (_, args) => {
-      onSuccess(args.name);
+    mutationFn: (args: {
+      assessmentId: number;
+      applicationName?: string;
+      applicationId?: number;
+      archetypeId?: number;
+    }) => {
+      const deletedAssessment = deleteAssessment(args.assessmentId);
+
+      queryClient.invalidateQueries([assessmentQueryKey, args?.assessmentId]);
+      queryClient.invalidateQueries([ARCHETYPE_QUERY_KEY, args?.archetypeId]);
       queryClient.invalidateQueries([
         assessmentsByItemIdQueryKey,
-        args.id,
-        QuestionnairesQueryKey,
+        args?.archetypeId,
       ]);
+      queryClient.invalidateQueries([
+        assessmentsByItemIdQueryKey,
+        args?.applicationId,
+      ]);
+
+      return deletedAssessment;
+    },
+    onSuccess: (_, args) => {
+      onSuccess && onSuccess(args?.applicationName || "Unknown");
     },
     onError: onError,
   });