From 8ee1b9b85d03ac9357d691f0611c43b2141f1472 Mon Sep 17 00:00:00 2001 From: DvoraShechter1 Date: Sun, 27 Oct 2024 00:14:55 +0300 Subject: [PATCH] add summary of issues to the ApplicationDetailDrawer Signed-off-by: DvoraShechter1 --- client/public/locales/en/translation.json | 4 +++ .../application-detail-drawer.tsx | 27 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json index 90f7dff216..4e08b517e5 100644 --- a/client/public/locales/en/translation.json +++ b/client/public/locales/en/translation.json @@ -161,6 +161,10 @@ "medium": "Medium", "small": "Small" }, + "issues": { + "noIssues": "Congratulations! No issues were found", + "issuesFound": "{{minor}} minor, {{critical}} critical" + }, "message": { "archetypeApplicationCount": "{{count}} application", "archetypeApplicationCount_plural": "{{count}} applications", diff --git a/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer.tsx b/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer.tsx index 882578b58e..f5675a63b5 100644 --- a/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer.tsx +++ b/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer.tsx @@ -34,6 +34,8 @@ import { Ref, Archetype, TaskDashboard, + AnalysisRuleReport, + AnalysisIssueReport, } from "@app/api/models"; import { COLOR_HEX_VALUES_BY_NAME } from "@app/Constants"; import { useFetchFacts } from "@app/queries/facts"; @@ -65,6 +67,7 @@ import { useFetchArchetypes } from "@app/queries/archetypes"; import { useFetchAssessments } from "@app/queries/assessments"; import { DecoratedApplication } from "../../applications-table/useDecoratedApplications"; import { TaskStates } from "@app/queries/tasks"; +import { useFetchIssueReports } from "@app/queries/issues"; export interface IApplicationDetailDrawerProps extends Pick { @@ -182,6 +185,19 @@ const TabDetailsContent: React.FC<{ .filter((fullArchetype) => fullArchetype?.review) .filter(Boolean); + const issueReportsQuery = useFetchIssueReports(application.id); + const { + result: { data, total: totalReportCount }, + isFetching: isFetchingReports, + fetchError: reportsFetchError, + } = issueReportsQuery; + const currentPageReports = data as ( + | AnalysisRuleReport + | AnalysisIssueReport + )[]; + const minor = currentPageReports.filter((u) => u.effort === 1).length; + const critical = currentPageReports.filter((u) => u.effort > 1).length; + return ( <> @@ -194,6 +210,17 @@ const TabDetailsContent: React.FC<{ Issues + + {application.tasks.currentAnalyzer === undefined || + application.tasks.currentAnalyzer.state === "Failed" + ? t("terms.unassigned") + : currentPageReports.length === 0 + ? t("issues.noIssues") + : t("issues.issuesFound", { + minor: minor, + critical: critical, + })} +