✨ Add question mark icon for archetype assessed indicator

konveyor · Nov 21, 2023 · e00ea89 · e00ea89
1 parent d215b73
commit e00ea89
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
@@ -251,6 +251,7 @@
     "artifact": "Artifact",
     "artifactAssociated": "Associated artifact",
     "artifactNotAssociated": "No associated artifact",
+    "assessedArchetype": "Archetype assessed",
     "assessment": "Assessment",
     "assessmentQuestionnaires": "Assessment questionnaires",
     "assessmentNotes": "Assessment notes",
@@ -368,6 +369,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
@@ -841,6 +841,10 @@ export const ApplicationsTable: React.FC = () => {
                   (archetype) => !!archetype?.review
                 );
 
+                const hasAssessedArchetype = applicationArchetypes?.some(
+                  (archetype) => !!archetype?.assessments?.length
+                );
+
                 return (
                   <Tr
                     key={application.name}
@@ -869,22 +873,45 @@ export const ApplicationsTable: React.FC = () => {
                           />
                         )}
                       </Td>
-                      <Td
+                      {/* <Td
                         width={10}
                         modifier="truncate"
                         {...getTdProps({ columnKey: "assessment" })}
                       >
                         <ApplicationAssessmentStatus
                           application={application}
                         />
+                      </Td> */}
+                      <Td
+                        width={10}
+                        modifier="truncate"
+                        {...getTdProps({ columnKey: "assessment" })}
+                      >
+                        <Grid>
+                          <GridItem span={8}>
+                            <ApplicationAssessmentStatus
+                              application={application}
+                            />
+                          </GridItem>
+                          <GridItem span={1}>
+                            {hasAssessedArchetype && (
+                              <Tooltip
+                                content={t("terms.assessedArchetype")}
+                                aria-label="assessment"
+                              >
+                                <QuestionCircleIcon />
+                              </Tooltip>
+                            )}
+                          </GridItem>
+                        </Grid>
                       </Td>
                       <Td
                         width={10}
                         modifier="truncate"
                         {...getTdProps({ columnKey: "review" })}
                       >
                         <Grid>
-                          <GridItem span={10}>
+                          <GridItem span={8}>
                             <IconedStatus
                               preset={
                                 isAppReviewed || hasReviewedArchetype
@@ -893,7 +920,7 @@ export const ApplicationsTable: React.FC = () => {
                               }
                             />
                           </GridItem>
-                          <GridItem span={2}>
+                          <GridItem span={1}>
                             {hasReviewedArchetype ? (
                               <Tooltip
                                 content={t("terms.reviewedArchetype")}