Enable save on assessment change

Signed-off-by: Radoslaw Szwajkowski <[email protected]>

Author: rszwajko

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

@@ -160,7 +160,6 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
   const isValid = methods.formState.isValid;
   const isSubmitting = methods.formState.isSubmitting;
   const isValidating = methods.formState.isValidating;
-  const watchAllFields = methods.watch();
 
   const disableNavigation = !isValid || isSubmitting;
 
@@ -439,10 +438,10 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
     }
   };
 
-  const haveAnyQuestionBeenAnswered = () => {
+  const haveAnyNewQuestionBeenAnswered = () => {
     const questions = values[QUESTIONS_KEY];
-    return Object.values(questions).some(
-      (answer) => answer !== null && answer !== ""
+    return Object.entries(questions).some(
+      ([name, answer]) => initialQuestions[name] !== answer
     );
   };
 
@@ -486,6 +485,7 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
         isLastStep={step === sortedSections.length}
         onNext={() => setCurrentStep(step + 1)}
         onBack={() => setCurrentStep(step - 1)}
+        haveAnyNewQuestionBeenAnswered={haveAnyNewQuestionBeenAnswered()}
         isDisabled={
           isSubmitting ||
           isValidating ||
@@ -574,7 +574,7 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
               onClose={() => setAssessmentToCancel(null)}
               onConfirm={() => handleCancelAssessment()}
               message={
-                haveAnyQuestionBeenAnswered()
+                haveAnyNewQuestionBeenAnswered()
                   ? t("message.unsavedChanges")
                   : t("message.noAnswers")
               }

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

@@ -13,6 +13,7 @@ export interface CustomWizardFooterProps {
   isDisabled: boolean;
   isFormInvalid: boolean;
   isSaveAsDraftDisabled?: boolean;
+  haveAnyNewQuestionBeenAnswered?: boolean;
   enableNext?: boolean;
   onNext?: () => void;
   onBack?: () => void;
@@ -27,6 +28,7 @@ export const CustomWizardFooter: React.FC<CustomWizardFooterProps> = ({
   isDisabled,
   isFormInvalid,
   isSaveAsDraftDisabled,
+  haveAnyNewQuestionBeenAnswered,
   enableNext,
   onNext,
   onBack,
@@ -35,7 +37,7 @@ export const CustomWizardFooter: React.FC<CustomWizardFooterProps> = ({
   onSaveAsDraft,
 }) => {
   const { t } = useTranslation();
-  const { goToNextStep, goToPrevStep, close, activeStep } = useWizardContext();
+  const { goToNextStep, goToPrevStep, close } = useWizardContext();
   return (
     <>
       <WizardFooterWrapper>
@@ -45,15 +47,25 @@ export const CustomWizardFooter: React.FC<CustomWizardFooterProps> = ({
               <Button
                 variant="primary"
                 onClick={() => onSave(false)}
-                isDisabled={!enableNext || isDisabled || isFormInvalid}
+                isDisabled={
+                  !enableNext ||
+                  isDisabled ||
+                  isFormInvalid ||
+                  !haveAnyNewQuestionBeenAnswered
+                }
                 cy-data="next"
               >
                 {t("actions.save")}
               </Button>
               <Button
                 variant="primary"
                 onClick={() => onSave(true)}
-                isDisabled={!enableNext || isDisabled || isFormInvalid}
+                isDisabled={
+                  !enableNext ||
+                  isDisabled ||
+                  isFormInvalid ||
+                  !haveAnyNewQuestionBeenAnswered
+                }
                 cy-data="save-and-review"
               >
                 {t("actions.saveAndReview")}

client/src/app/pages/assessment/components/custom-wizard-footer/tests/custom-wizard-footer.test.tsx

@@ -91,6 +91,7 @@ describe("AppPlaceholder", () => {
         isLastStep={true}
         isDisabled={false}
         isFormInvalid={false}
+        haveAnyNewQuestionBeenAnswered={true}
         enableNext={true}
         onSave={onSaveSpy}
         onSaveAsDraft={jest.fn()}