✨ Override review confirmation & drawer updates

client/public/locales/en/translation.json

@@ -184,8 +184,9 @@
     "noResultsFoundTitle": "No results found",
     "overrideAssessmentDescription": "The application {{name}} already is associated with archetypes: {{what}}.",
     "overrideAssessmentConfirmation": "Do you want to create a dedicated assessment for this application and override the inherited archetype assessment(s)?",
-    "overrideReviewConfirmation": "This application has already been reviewed. Do you want to continue?",
-    "overrideArchetypeReviewConfirmation": "This archetype has already been reviewed. Do you want to continue?",
+    "overrideArchetypeReviewDescription": "The application {{name}} already is associated with archetypes: {{what}}.",
+    "overrideArchetypeReviewConfirmation": "Do you want to create a dedicated review for this application and override the inherited archetype review?",
+    "overrideReviewConfirmation": "This archetype has already been reviewed. Do you want to continue?",
     "reasonForError": "The reported reason for the error:",
     "reviewInstructions": "Use this section to provide your assessment of the possible migration/modernization plan and effort estimation.",
     "savingSelection": "Saving selection",

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

@@ -92,7 +92,11 @@ import { ImportApplicationsForm } from "../components/import-applications-form";
 import { ConditionalRender } from "@app/components/ConditionalRender";
 import { NoDataEmptyState } from "@app/components/NoDataEmptyState";
 import { ConditionalTooltip } from "@app/components/ConditionalTooltip";
-import { getAssessmentsByItemId, getTaskById } from "@app/api/rest";
+import {
+  getArchetypeById,
+  getAssessmentsByItemId,
+  getTaskById,
+} from "@app/api/rest";
 import { ApplicationDependenciesForm } from "@app/components/ApplicationDependenciesFormContainer/ApplicationDependenciesForm";
 import { useFetchArchetypes } from "@app/queries/archetypes";
 import { useState } from "react";
@@ -127,9 +131,15 @@ export const ApplicationsTable: React.FC = () => {
     Ref[] | null
   >(null);
 
+  const [archetypeRefsToOverrideReview, setArchetypeRefsToOverrideReview] =
+    React.useState<Ref[] | null>(null);
+
   const [applicationToAssess, setApplicationToAssess] =
     React.useState<Application | null>(null);
 
+  const [applicationToReview, setApplicationToReview] =
+    React.useState<Application | null>(null);
+
   /*** Analysis */
 
   const [isAnalyzeModalOpen, setAnalyzeModalOpen] = useState(false);
@@ -635,8 +645,38 @@ export const ApplicationsTable: React.FC = () => {
       handleNavToAssessment(application);
     }
   };
-  const reviewSelectedApp = (application: Application) => {
-    if (application.review) {
+
+  const reviewSelectedApp = async (application: Application) => {
+    setApplicationToReview(application);
+    if (application?.archetypes?.length) {
+      for (const archetypeRef of application.archetypes) {
+        try {
+          const archetype = await getArchetypeById(archetypeRef.id);
+
+          if (archetype?.review) {
+            setArchetypeRefsToOverrideReview(application.archetypes);
+            break;
+          } else if (application.review) {
+            setReviewToEdit(application.id);
+          } else {
+            history.push(
+              formatPath(Paths.applicationsReview, {
+                applicationId: application.id,
+              })
+            );
+          }
+        } catch (error) {
+          console.error(
+            `Error fetching archetype with ID ${archetypeRef.id}:`,
+            error
+          );
+          pushNotification({
+            title: t("terms.error"),
+            variant: "danger",
+          });
+        }
+      }
+    } else if (application.review) {
       setReviewToEdit(application.id);
     } else {
       history.push(
@@ -1202,6 +1242,34 @@ export const ApplicationsTable: React.FC = () => {
             setReviewToEdit(null);
           }}
         />
+        <ConfirmDialog
+          title={t("composed.new", {
+            what: t("terms.review").toLowerCase(),
+          })}
+          alertMessage={t("message.overrideArchetypeReviewDescription", {
+            what:
+              archetypeRefsToOverrideReview
+                ?.map((archetypeRef) => archetypeRef.name)
+                .join(", ") || "Archetype name",
+          })}
+          message={t("message.overrideArchetypeReviewConfirmation")}
+          titleIconVariant={"warning"}
+          isOpen={archetypeRefsToOverrideReview !== null}
+          confirmBtnVariant={ButtonVariant.primary}
+          confirmBtnLabel={t("actions.override")}
+          cancelBtnLabel={t("actions.cancel")}
+          onCancel={() => setArchetypeRefsToOverrideReview(null)}
+          onClose={() => setArchetypeRefsToOverrideReview(null)}
+          onConfirm={() => {
+            applicationToReview &&
+              history.push(
+                formatPath(Paths.applicationsReview, {
+                  applicationId: applicationToReview?.id,
+                })
+              );
+            setArchetypeRefsToOverride(null);
+          }}
+        />
         <ConfirmDialog
           title={t("composed.new", {
             what: t("terms.assessment").toLowerCase(),
@@ -1226,11 +1294,6 @@ export const ApplicationsTable: React.FC = () => {
               handleNavToViewArchetypes(applicationToAssess);
           }}
           onConfirm={() => {
-            history.push(
-              formatPath(Paths.applicationAssessmentActions, {
-                applicationId: activeItem?.id,
-              })
-            );
             setArchetypeRefsToOverride(null);
             applicationToAssess && handleNavToAssessment(applicationToAssess);
           }}

client/src/app/pages/applications/components/application-detail-drawer/review-fields.tsx

@@ -49,7 +49,7 @@ export const ReviewFields: React.FC<{
     .filter(Boolean);
 
   const groupedReviewList: ReviewDrawerLabelItem[] = [
-    ...(archetypeReview
+    ...(archetypeReview && !appReview
       ? [
           {
             review: archetypeReview,
@@ -66,12 +66,11 @@ export const ReviewFields: React.FC<{
             isArchetype: false,
           },
         ]
-      : []),
-    ...matchedArchetypeReviews.map((archetypeReview) => ({
-      review: archetypeReview,
-      name: archetypeReview?.archetype?.name,
-      isArchetype: true,
-    })),
+      : matchedArchetypeReviews.map((archetypeReview) => ({
+          review: archetypeReview,
+          name: archetypeReview?.archetype?.name,
+          isArchetype: true,
+        }))),
   ].filter((item) => item.review?.proposedAction);
 
   return (