From 82a704c4b855a78bed080a0dc1a85df942ec5b4b Mon Sep 17 00:00:00 2001
From: Ian Bolton <ibolton@redhat.com>
Date: Wed, 22 Nov 2023 19:05:31 -0500
Subject: [PATCH] :sparkles: Add question mark icon for archetype assessed
 indicator (#1561)

Resolves https://issues.redhat.com/browse/MTA-1712?filter=12422675

---------

Signed-off-by: ibolton336 <ibolton@redhat.com>
---
 client/public/locales/en/translation.json     |  4 ++
 .../applications-table/applications-table.tsx | 57 ++++++++++++-------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
index 46a981598c..cfa6b25d21 100644
--- a/client/public/locales/en/translation.json
+++ b/client/public/locales/en/translation.json
@@ -161,6 +161,8 @@
     "archetypeApplicationCount": "{{count}} application",
     "archetypeApplicationCount_plural": "{{count}} applications",
     "archetypeNoApplications": "No applications currently match the criteria tags.",
+    "archetypeAlreadyAssessed": "An assessment for one or more of the archetypes this application is associated with exists.",
+    "archetypeAlreadyReviewed": "A review for one or more of the archetypes this application is associated with exists. Open the details drawer to view the review(s).",
     "appNotAssesedTitle": "Assessment has not been completed",
     "appNotAssessedBody": "In order to review an application it must be assessed first. Assess the application and try again.",
     "assessmentStakeholderHeader": "Select the stakeholder(s) or stakeholder group(s) associated with this assessment.",
@@ -251,6 +253,7 @@
     "artifact": "Artifact",
     "artifactAssociated": "Associated artifact",
     "artifactNotAssociated": "No associated artifact",
+    "assessedArchetype": "Archetype assessed",
     "assessment": "Assessment",
     "assessmentQuestionnaires": "Assessment questionnaires",
     "assessmentNotes": "Assessment notes",
@@ -368,6 +371,7 @@
     "repositoryType": "Repository type",
     "review": "Review",
     "reviewedArchetype": "Archetype reviewed",
+
     "reviews": "Reviews",
     "reviewComments": "Review comments",
     "risk": "Risk",
diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
index 947bc656e3..7afc874fbd 100644
--- a/client/src/app/pages/applications/applications-table/applications-table.tsx
+++ b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -17,9 +17,8 @@ import {
   MenuToggle,
   MenuToggleElement,
   Modal,
-  Tooltip,
-  Grid,
-  GridItem,
+  Flex,
+  FlexItem,
 } from "@patternfly/react-core";
 import { PencilAltIcon, TagIcon, EllipsisVIcon } from "@patternfly/react-icons";
 import {
@@ -841,6 +840,10 @@ export const ApplicationsTable: React.FC = () => {
                   (archetype) => !!archetype?.review
                 );
 
+                const hasAssessedArchetype = applicationArchetypes?.some(
+                  (archetype) => !!archetype?.assessments?.length
+                );
+                console.log("hasassessed", hasAssessedArchetype);
                 return (
                   <Tr
                     key={application.name}
@@ -870,21 +873,33 @@ export const ApplicationsTable: React.FC = () => {
                         )}
                       </Td>
                       <Td
-                        width={10}
+                        width={15}
                         modifier="truncate"
                         {...getTdProps({ columnKey: "assessment" })}
                       >
-                        <ApplicationAssessmentStatus
-                          application={application}
-                        />
+                        <Flex alignItems={{ default: "alignItemsCenter" }}>
+                          <FlexItem>
+                            <ApplicationAssessmentStatus
+                              application={application}
+                            />
+                          </FlexItem>
+                          <FlexItem>
+                            <ConditionalTooltip
+                              isTooltipEnabled={hasAssessedArchetype || false}
+                              content={t("message.archetypeAlreadyAssessed")}
+                            >
+                              <QuestionCircleIcon />
+                            </ConditionalTooltip>
+                          </FlexItem>
+                        </Flex>
                       </Td>
                       <Td
-                        width={10}
+                        width={15}
                         modifier="truncate"
                         {...getTdProps({ columnKey: "review" })}
                       >
-                        <Grid>
-                          <GridItem span={10}>
+                        <Flex alignItems={{ default: "alignItemsCenter" }}>
+                          <FlexItem>
                             <IconedStatus
                               preset={
                                 isAppReviewed || hasReviewedArchetype
@@ -892,18 +907,16 @@ export const ApplicationsTable: React.FC = () => {
                                   : "NotStarted"
                               }
                             />
-                          </GridItem>
-                          <GridItem span={2}>
-                            {hasReviewedArchetype ? (
-                              <Tooltip
-                                content={t("terms.reviewedArchetype")}
-                                aria-label="review"
-                              >
-                                <QuestionCircleIcon />
-                              </Tooltip>
-                            ) : null}
-                          </GridItem>
-                        </Grid>
+                          </FlexItem>
+                          <FlexItem>
+                            <ConditionalTooltip
+                              isTooltipEnabled={hasReviewedArchetype || false}
+                              content={t("message.archetypeAlreadyReviewed")}
+                            >
+                              <QuestionCircleIcon />
+                            </ConditionalTooltip>
+                          </FlexItem>
+                        </Flex>
                       </Td>
                       <Td
                         width={10}