Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Add question mark icon for archetype assessed indicator #1561

Merged
merged 7 commits into from
Nov 23, 2023
+39 −22
Merged

✨ Add question mark icon for archetype assessed indicator #1561

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
51f9a04
:sparkles: Add question mark icon for archetype assessed indicator
ibolton336 Nov 21, 2023
9fc97f2
Address PR comments
ibolton336 Nov 22, 2023
752bc8e
Merge branch 'main' into mta-1712
ibolton336 Nov 22, 2023
3138872
Update tooltip and fix style
ibolton336 Nov 22, 2023
8c64a7a
Merge branch 'main' into mta-1712
ibolton336 Nov 22, 2023
9358e51
Merge branch 'main' into mta-1712
ibolton336 Nov 22, 2023
303f189
Merge branch 'main' into mta-1712
ibolton336 Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions client/public/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@
"artifact": "Artifact",
"artifactAssociated": "Associated artifact",
"artifactNotAssociated": "No associated artifact",
"assessedArchetype": "Archetype assessed",
"assessment": "Assessment",
"assessmentQuestionnaires": "Assessment questionnaires",
"assessmentNotes": "Assessment notes",
Expand Down Expand Up @@ -368,6 +369,7 @@
"repositoryType": "Repository type",
"review": "Review",
"reviewedArchetype": "Archetype reviewed",

"reviews": "Reviews",
"reviewComments": "Review comments",
"risk": "Risk",
Expand Down
24 changes: 21 additions & 3 deletions client/src/app/pages/applications/applications-table/applications-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -874,9 +878,23 @@ export const ApplicationsTable: React.FC = () => {
modifier="truncate"
{...getTdProps({ columnKey: "assessment" })}
>
<ApplicationAssessmentStatus
application={application}
/>
<Grid>
<GridItem span={10}>
<ApplicationAssessmentStatus
application={application}
/>
</GridItem>
<GridItem span={2}>
{hasAssessedArchetype && (
<Tooltip
content={t("terms.assessedArchetype")}
aria-label="assessment"
>
<QuestionCircleIcon />
</Tooltip>
)}
</GridItem>
</Grid>
</Td>
<Td
width={10}
Expand Down
Loading