🐛 Adjust save as draft logic (#1497)

https://issues.redhat.com/browse/MTA-1451 https://issues.redhat.com/browse/MTA-1207 Signed-off-by: ibolton336 <[email protected]>
konveyor · Oct 28, 2023 · 319f8d2 · 319f8d2
1 parent 6179d70
commit 319f8d2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/client/src/app/pages/assessment/components/assessment-wizard/assessment-wizard.tsx b/client/src/app/pages/assessment/components/assessment-wizard/assessment-wizard.tsx
@@ -186,14 +186,16 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
     );
   };
 
-  const hasPartialAnswers = (section: Section): boolean => {
-    const someQuestionsAnswered = section?.questions.some((question) => {
-      return questionHasValue(question);
+  const shouldDisableSaveAsDraft = (sections: Section[]): boolean => {
+    const noAnswers = sections.every((section) => {
+      return section.questions.every((question) => !questionHasValue(question));
     });
 
-    const allQuestionsAnswered = areAllQuestionsAnswered(section);
+    const allQuestionsAnswered = sections.every((section) =>
+      areAllQuestionsAnswered(section)
+    );
 
-    return someQuestionsAnswered && !allQuestionsAnswered;
+    return noAnswers || allQuestionsAnswered;
   };
 
   const shouldNextBtnBeEnabled = (section: Section): boolean => {
@@ -500,7 +502,7 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
           (step === sortedSections.length &&
             !shouldNextBtnBeEnabled(sortedSections[step - 1]))
         }
-        hasAnswers={hasPartialAnswers(sortedSections[step - 1])}
+        isSaveAsDraftDisabled={shouldDisableSaveAsDraft(sortedSections)}
         isFormInvalid={!isValid}
         onSave={(review) => {
           const saveActionValue = review

diff --git a/client/src/app/pages/assessment/components/custom-wizard-footer/custom-wizard-footer.tsx b/client/src/app/pages/assessment/components/custom-wizard-footer/custom-wizard-footer.tsx
@@ -12,7 +12,7 @@ export interface CustomWizardFooterProps {
   isLastStep: boolean;
   isDisabled: boolean;
   isFormInvalid: boolean;
-  hasAnswers?: boolean;
+  isSaveAsDraftDisabled?: boolean;
   enableNext?: boolean;
   onNext?: () => void;
   onBack?: () => void;
@@ -26,7 +26,7 @@ export const CustomWizardFooter: React.FC<CustomWizardFooterProps> = ({
   isLastStep,
   isDisabled,
   isFormInvalid,
-  hasAnswers,
+  isSaveAsDraftDisabled,
   enableNext,
   onNext,
   onBack,
@@ -97,7 +97,7 @@ export const CustomWizardFooter: React.FC<CustomWizardFooterProps> = ({
             <Button
               variant="link"
               onClick={onSaveAsDraft}
-              isDisabled={isFormInvalid || isFirstStep || !hasAnswers}
+              isDisabled={isFormInvalid || isFirstStep || isSaveAsDraftDisabled}
               cy-data="save-as-draft"
             >
               {t("actions.saveAsDraft")}

diff --git a/.../app/pages/assessment/components/custom-wizard-footer/tests/custom-wizard-footer.test.tsx b/.../app/pages/assessment/components/custom-wizard-footer/tests/custom-wizard-footer.test.tsx
@@ -112,7 +112,7 @@ describe("AppPlaceholder", () => {
         isLastStep={false}
         isDisabled={false}
         isFormInvalid={false}
-        hasAnswers={true}
+        isSaveAsDraftDisabled={false}
         onSave={jest.fn()}
         onSaveAsDraft={onSaveAsDraftSpy}
       />