Wire discard back in

konveyor · Sep 19, 2023 · 41a205f · 41a205f
1 parent f7a12f1
commit 41a205f
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 26 deletions.
diff --git a/...rc/app/pages/applications/applications-table-assessment/applications-table-assessment.tsx b/...rc/app/pages/applications/applications-table-assessment/applications-table-assessment.tsx
@@ -669,6 +669,15 @@ export const ApplicationsTable: React.FC = () => {
                             title: t("actions.review"),
                             onClick: () => reviewSelectedApp(application),
                           },
+                          ...(application?.review
+                            ? [
+                                {
+                                  title: t("actions.discardAssessment"),
+                                  onClick: () =>
+                                    setAssessmentOrReviewToDiscard(application),
+                                },
+                              ]
+                            : []),
                           {
                             title: t("actions.delete"),
                             onClick: () =>

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
@@ -125,13 +125,17 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
 
   useEffect(() => {
     methods.reset({
-      // stakeholders: assessment?.stakeholders || [],
-      // stakeholderGroups: assessment?.stakeholderGroups || [],
+      stakeholders:
+        assessment?.stakeholders.map((stakeholder) => stakeholder.name) || [],
+      stakeholderGroups:
+        assessment?.stakeholderGroups.map(
+          (stakeholderGroup) => stakeholderGroup.name
+        ) || [],
       // comments: initialComments,
       questions: initialQuestions,
       [SAVE_ACTION_KEY]: SAVE_ACTION_VALUE.SAVE_AS_DRAFT,
     });
-  }, [initialQuestions]);
+  }, [initialQuestions, assessment]);
 
   const validationSchema = yup.object().shape({
     stakeholders: yup.array().of(yup.string()),
@@ -370,22 +374,41 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
         title: "Assessment has been saved.",
         variant: "success",
       });
-
-      assessment?.application?.id &&
-        getApplicationById(assessment.application.id)
-          .then((data) => {
-            history.push(
-              formatPath(Paths.applicationsReview, {
-                applicationId: data.id,
-              })
-            );
-          })
-          .catch((error) => {
-            pushNotification({
-              title: getAxiosErrorMessage(error),
-              variant: "danger",
+      if (isArchetype) {
+        //TODO: Review Archetype?
+        // assessment?.archetype?.id &&
+        //   getArchetypeById(assessment.archetype.id)
+        //     .then((data) => {
+        //       history.push(
+        //         formatPath(Paths.a, {
+        //           applicationId: data.id,
+        //         })
+        //       );
+        //     })
+        //     .catch((error) => {
+        //       pushNotification({
+        //         title: getAxiosErrorMessage(error),
+        //         variant: "danger",
+        //       });
+        //     });
+        // }
+      } else {
+        assessment?.application?.id &&
+          getApplicationById(assessment.application.id)
+            .then((data) => {
+              history.push(
+                formatPath(Paths.applicationsReview, {
+                  applicationId: data.id,
+                })
+              );
+            })
+            .catch((error) => {
+              pushNotification({
+                title: getAxiosErrorMessage(error),
+                variant: "danger",
+              });
             });
-          });
+      }
     } catch (error) {
       pushNotification({
         title: "Failed to save.",
@@ -448,6 +471,7 @@ export const AssessmentWizard: React.FC<AssessmentWizardProps> = ({
 
   const wizardFooter = (
     <CustomWizardFooter
+      isArchetype={isArchetype}
       isFirstStep={currentStep === 0}
       isLastStep={currentStep === sortedSections.length}
       isDisabled={

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,6 +12,7 @@ export interface CustomWizardFooterProps {
   isLastStep: boolean;
   isDisabled: boolean;
   isFormInvalid: boolean;
+  isArchetype?: boolean;
   onSave: (review: boolean) => void;
   onSaveAsDraft: () => void;
 }
@@ -21,6 +22,7 @@ export const CustomWizardFooter: React.FC<CustomWizardFooterProps> = ({
   isLastStep,
   isDisabled,
   isFormInvalid,
+  isArchetype,
   onSave,
   onSaveAsDraft,
 }) => {
@@ -47,14 +49,16 @@ export const CustomWizardFooter: React.FC<CustomWizardFooterProps> = ({
                   >
                     {t("actions.save")}
                   </Button>
-                  <Button
-                    variant="primary"
-                    onClick={() => onSave(true)}
-                    isDisabled={!enableNext || isDisabled || isFormInvalid}
-                    cy-data="save-and-review"
-                  >
-                    {t("actions.saveAndReview")}
-                  </Button>
+                  {!isArchetype && (
+                    <Button
+                      variant="primary"
+                      onClick={() => onSave(true)}
+                      isDisabled={!enableNext || isDisabled || isFormInvalid}
+                      cy-data="save-and-review"
+                    >
+                      {t("actions.saveAndReview")}
+                    </Button>
+                  )}
                 </>
               ) : (
                 <Button