From 32d426a256e233c23f468373d4bc51776fb6b763 Mon Sep 17 00:00:00 2001 From: ibolton336 Date: Tue, 24 Oct 2023 16:47:21 -0400 Subject: [PATCH 1/2] :bug: Add risk to assessment drawer Signed-off-by: ibolton336 --- client/src/app/api/models.ts | 2 ++ .../application-detail-drawer-assessment.tsx | 5 +++-- .../application-detail-drawer/application-risk.tsx | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/client/src/app/api/models.ts b/client/src/app/api/models.ts index b9fc7750be..ce7b348ae8 100644 --- a/client/src/app/api/models.ts +++ b/client/src/app/api/models.ts @@ -130,6 +130,8 @@ export interface Application { assessments?: Ref[]; assessed?: boolean; archetypes?: Ref[]; + risk?: Risk; + confidence?: number; } export interface Review { diff --git a/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer-assessment.tsx b/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer-assessment.tsx index 9d7ed5c496..9bc3d9584b 100644 --- a/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer-assessment.tsx +++ b/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer-assessment.tsx @@ -22,6 +22,7 @@ import { } from "./application-detail-drawer"; import { useFetchReviewById } from "@app/queries/reviews"; import { ReviewedArchetypeItem } from "./reviewed-archetype-item"; +import { ApplicationRisk } from "./application-risk"; export interface IApplicationDetailDrawerAssessmentProps extends Pick { @@ -136,12 +137,12 @@ export const ApplicationDetailDrawerAssessment: React.FC< {appReview?.workPriority || notYetReviewed} - {/* + {t("terms.risk")} {application && } - */} + diff --git a/client/src/app/pages/applications/components/application-detail-drawer/application-risk.tsx b/client/src/app/pages/applications/components/application-detail-drawer/application-risk.tsx index ac75cc7560..fc237900eb 100644 --- a/client/src/app/pages/applications/components/application-detail-drawer/application-risk.tsx +++ b/client/src/app/pages/applications/components/application-detail-drawer/application-risk.tsx @@ -36,5 +36,5 @@ export const ApplicationRisk: React.FC<IApplicationRiskProps> = ({ ); } - return <RiskLabel risk={assessments[0].risk || "unknown"} />; + return <RiskLabel risk={application.risk || "unknown"} />; }; From 6d7708033de06877a5e5d06afee28d205e30998a Mon Sep 17 00:00:00 2001 From: ibolton336 <ibolton@redhat.com> Date: Thu, 26 Oct 2023 11:34:16 -0400 Subject: [PATCH 2/2] Remove old component Signed-off-by: ibolton336 <ibolton@redhat.com> --- .../application-detail-drawer-assessment.tsx | 4 +- .../application-risk.tsx | 40 ------------------- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 client/src/app/pages/applications/components/application-detail-drawer/application-risk.tsx diff --git a/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer-assessment.tsx b/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer-assessment.tsx index 9bc3d9584b..5188bfd400 100644 --- a/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer-assessment.tsx +++ b/client/src/app/pages/applications/components/application-detail-drawer/application-detail-drawer-assessment.tsx @@ -22,7 +22,7 @@ import { } from "./application-detail-drawer"; import { useFetchReviewById } from "@app/queries/reviews"; import { ReviewedArchetypeItem } from "./reviewed-archetype-item"; -import { ApplicationRisk } from "./application-risk"; +import { RiskLabel } from "@app/components/RiskLabel"; export interface IApplicationDetailDrawerAssessmentProps extends Pick<IApplicationDetailDrawerProps, "application" | "onCloseClick"> { @@ -140,7 +140,7 @@ export const ApplicationDetailDrawerAssessment: React.FC< <DescriptionListGroup> <DescriptionListTerm>{t("terms.risk")}</DescriptionListTerm> <DescriptionListDescription cy-data="risk"> - {application && <ApplicationRisk application={application} />} + <RiskLabel risk={application?.risk || "unknown"} /> </DescriptionListDescription> </DescriptionListGroup> </DescriptionList> diff --git a/client/src/app/pages/applications/components/application-detail-drawer/application-risk.tsx b/client/src/app/pages/applications/components/application-detail-drawer/application-risk.tsx deleted file mode 100644 index fc237900eb..0000000000 --- a/client/src/app/pages/applications/components/application-detail-drawer/application-risk.tsx +++ /dev/null @@ -1,40 +0,0 @@ -import React from "react"; - -import { RiskLabel } from "@app/components/RiskLabel"; -import { Application } from "@app/api/models"; -import { useFetchAssessmentsByItemId } from "@app/queries/assessments"; -import { Alert, Spinner } from "@patternfly/react-core"; - -export interface IApplicationRiskProps { - application: Application; -} - -export const ApplicationRisk: React.FC<IApplicationRiskProps> = ({ - application, -}) => { - const { - assessments, - isFetching: isFetchingAssessmentsById, - fetchError, - } = useFetchAssessmentsByItemId(false, application.id); - - if (isFetchingAssessmentsById || fetchError) { - return ( - <> - {isFetchingAssessmentsById && <Spinner />}{" "} - {fetchError && <Alert variant="warning" isInline title="Error" />} - </> - ); - } - - if (!assessments || assessments.length === 0) { - return ( - <> - <RiskLabel risk={"unknown"} /> - {isFetchingAssessmentsById && <Spinner />} - </> - ); - } - - return <RiskLabel risk={application.risk || "unknown"} />; -};