From 050e3c7a89f9f48187380c4a5301b6a541d9e056 Mon Sep 17 00:00:00 2001 From: Ian Bolton Date: Wed, 11 Oct 2023 19:22:41 +0000 Subject: [PATCH] :ghost: remove reports that are unused (#1460) Resolves [mta-1345](https://issues.redhat.com/browse/MTA-1345) Signed-off-by: ibolton336 --- client/public/locales/en/translation.json | 3 +- client/src/app/api/models.ts | 1 + .../questionnaire-form/questionnaire-form.tsx | 5 +- .../adoption-candidate-table.tsx | 251 +++++++----------- client/src/app/pages/reports/reports.tsx | 125 ++++----- client/src/app/pages/review/review-page.tsx | 8 +- 6 files changed, 166 insertions(+), 227 deletions(-) diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json index 6f6539145a..617c59b35e 100644 --- a/client/public/locales/en/translation.json +++ b/client/public/locales/en/translation.json @@ -216,7 +216,7 @@ "acceptedAppsAndDeps": "Accepted applications and dependencies", "add": "Add", "additionalNotesOrComments": "Additional notes or comments", - "adoptionCandidateDistribution": "Adoption candidate distribution", + "adoptionCandidateDistribution": "Assessment confidence and risk", "affectedApplications": "Affected applications", "analysis": "Analysis", "answer": "Answer", @@ -224,6 +224,7 @@ "application(s)": "Application(s)", "applicationImports": "Application imports", "applicationName": "Application name", + "archetypeName": "Archetype name", "applications": "Applications", "archetype": "Archetype", "archetypes": "Archetypes", diff --git a/client/src/app/api/models.ts b/client/src/app/api/models.ts index d296956d8c..4a12d6f85b 100644 --- a/client/src/app/api/models.ts +++ b/client/src/app/api/models.ts @@ -712,6 +712,7 @@ export interface Assessment description: string; status: AssessmentStatus; risk: Risk; + confidence?: number; stakeholders?: Ref[]; stakeholderGroups?: Ref[]; } diff --git a/client/src/app/pages/assessment/components/questionnaire-form/questionnaire-form.tsx b/client/src/app/pages/assessment/components/questionnaire-form/questionnaire-form.tsx index 10b9bc3e63..372eea8226 100644 --- a/client/src/app/pages/assessment/components/questionnaire-form/questionnaire-form.tsx +++ b/client/src/app/pages/assessment/components/questionnaire-form/questionnaire-form.tsx @@ -13,7 +13,6 @@ import HelpIcon from "@patternfly/react-icons/dist/esm/icons/help-icon"; import { MultiInputSelection } from "./multi-input-selection"; import { Question, QuestionHeader, QuestionBody } from "./question"; import { getCommentFieldName } from "../../form-utils"; -import { HookFormPFTextInput } from "@app/components/HookFormPFFields"; import { useFormContext } from "react-hook-form"; import { Section } from "@app/api/models"; import { AssessmentWizardValues } from "@app/pages/assessment/components/assessment-wizard/assessment-wizard"; @@ -87,7 +86,7 @@ export const QuestionnaireForm: React.FC = ({ ); })} - + {/* {t("terms.additionalNotesOrComments")} @@ -104,7 +103,7 @@ export const QuestionnaireForm: React.FC = ({ > - + */} ); }; diff --git a/client/src/app/pages/reports/components/adoption-candidate-table/adoption-candidate-table.tsx b/client/src/app/pages/reports/components/adoption-candidate-table/adoption-candidate-table.tsx index 3db5cddda8..5100273411 100644 --- a/client/src/app/pages/reports/components/adoption-candidate-table/adoption-candidate-table.tsx +++ b/client/src/app/pages/reports/components/adoption-candidate-table/adoption-candidate-table.tsx @@ -1,48 +1,38 @@ -import React, { useContext, useEffect, useMemo } from "react"; +import React, { useMemo } from "react"; import { useTranslation } from "react-i18next"; import { cellWidth, ICell, - IExtraData, IRow, IRowData, sortable, TableVariant, truncate, } from "@patternfly/react-table"; -import { Label } from "@patternfly/react-core"; -import { EFFORT_ESTIMATE_LIST, RISK_LIST } from "@app/Constants"; -import { - Application, - AssessmentConfidence, - Review, - Risk, -} from "@app/api/models"; +import { RISK_LIST } from "@app/Constants"; +import { Application, Assessment, Ref, Risk } from "@app/api/models"; -import { ApplicationSelectionContext } from "../../application-selection-context"; -import { useFetchReviewById } from "@app/queries/reviews"; -import { useQuery } from "@tanstack/react-query"; -import { useFetchRisks } from "@app/queries/risks"; +import { useFetchReviews } from "@app/queries/reviews"; import { AppTableWithControls } from "@app/components/AppTableWithControls"; import { FilterCategory, FilterType, FilterToolbar, } from "@app/components/FilterToolbar"; -import { ProposedActionLabel } from "@app/components/ProposedActionLabel"; import { RiskLabel } from "@app/components/RiskLabel"; -import { ToolbarBulkSelector } from "@app/components/ToolbarBulkSelector"; import { useLegacyFilterState } from "@app/hooks/useLegacyFilterState"; import { useLegacyPaginationState } from "@app/hooks/useLegacyPaginationState"; import { useLegacySortState } from "@app/hooks/useLegacySortState"; +import { useFetchAssessments } from "@app/queries/assessments"; export interface TableRowData { - application: Application; + application?: Ref | null; + archetype?: Ref | null; confidence?: number; risk: Risk; - review: Review | undefined; + // review: Review | undefined; } const ENTITY_FIELD = "entity"; @@ -61,69 +51,23 @@ export const AdoptionCandidateTable: React.FC = () => { // i18 const { t } = useTranslation(); - const { - allItems: allApplications, - selectedItems: selectedApplications, - areAllSelected: areAllApplicationsSelected, - isItemSelected: isApplicationSelected, - toggleItemSelected: toggleApplicationSelected, - selectAll: selectAllApplication, - setSelectedItems: setSelectedRows, - selectMultiple: selectMultipleApplications, - } = useContext(ApplicationSelectionContext); - - const { - data: confidence, - refetch: refreshConfidence, - isFetching, - error: fetchError, - } = useQuery( - ["assessmentconfidence"], - async () => - // ( - // await getAssessmentConfidence( - // allApplications.length > 0 ? allApplications.map((f) => f.id!) : [] - // ) - // ).data, - [], - { - onError: (error) => console.log("error, ", error), - } - ); - - // Risk - const { risks: assessmentRisks, refetch: fetchRisks } = useFetchRisks( - allApplications.map((app) => app.id!) - ); - - // Start fetch - useEffect(() => { - if (allApplications.length > 0) { - refreshConfidence(); - fetchRisks(); - } - }, [allApplications, refreshConfidence, fetchRisks]); - // Table data - const allRows = useMemo(() => { - return allApplications.map((app) => { - const confidenceData = confidence?.find( - (e) => e.applicationId === app.id - ); - const { review: reviewData } = useFetchReviewById(app?.review?.id); - - const riskData = assessmentRisks?.find((e) => e.applicationId === app.id); + // const { reviews } = useFetchReviews(); + const { assessments } = useFetchAssessments(); + const { reviews } = useFetchReviews(); + const allRows = useMemo(() => { + return assessments.map((assessment: Assessment) => { const result: TableRowData = { - application: app, - confidence: confidenceData?.confidence, - // risk: riskData ? riskData.risk : "UNKNOWN", - risk: "unknown", - review: reviewData ? reviewData : undefined, + application: assessment?.application || null, + archetype: assessment?.archetype || null, + confidence: assessment.confidence, + risk: assessment.risk, + // review: reviewData ? reviewData : undefined, }; return result; }); - }, [allApplications, confidence, assessmentRisks]); + }, [assessments]); // Table const columns: ICell[] = [ @@ -133,35 +77,40 @@ export const AdoptionCandidateTable: React.FC = () => { cellTransforms: [truncate], }, { - title: t("terms.criticality"), - transforms: [sortable, cellWidth(15)], - cellTransforms: [], - }, - { - title: t("terms.priority"), - transforms: [sortable, cellWidth(15)], - cellTransforms: [], + title: t("terms.archetypeName"), + transforms: [sortable, cellWidth(25)], + cellTransforms: [truncate], }, + // { + // title: t("terms.criticality"), + // transforms: [sortable, cellWidth(15)], + // cellTransforms: [], + // }, + // { + // title: t("terms.priority"), + // transforms: [sortable, cellWidth(15)], + // cellTransforms: [], + // }, { title: t("terms.confidence"), transforms: [sortable, cellWidth(15)], cellTransforms: [], }, - { - title: t("terms.effort"), - transforms: [sortable, cellWidth(10)], - cellTransforms: [], - }, + // { + // title: t("terms.effort"), + // transforms: [sortable, cellWidth(10)], + // cellTransforms: [], + // }, { title: t("terms.risk"), transforms: [sortable, cellWidth(10)], cellTransforms: [], }, - { - title: t("terms.decision"), - transforms: [cellWidth(10)], - cellTransforms: [], - }, + // { + // title: t("terms.decision"), + // transforms: [cellWidth(10)], + // cellTransforms: [], + // }, ]; const filterCategories: FilterCategory[] = [ @@ -174,7 +123,7 @@ export const AdoptionCandidateTable: React.FC = () => { what: t("terms.name").toLowerCase(), }) + "...", getItemValue: (item) => { - return item?.application.name || ""; + return item?.application?.name || ""; }, }, ]; @@ -186,11 +135,12 @@ export const AdoptionCandidateTable: React.FC = () => { const getSortValues = (item: TableRowData) => [ "", - item?.application?.name || "", - item?.review?.businessCriticality || "", - item?.review?.workPriority || "", + // item?.application?.name || "", + // item?.archety?.name || "", + // item?.review?.businessCriticality || "", + // item?.review?.workPriority || "", item?.confidence || "", - item?.review?.effortEstimate || "", + // item?.review?.effortEstimate || "", RISK_LIST[item?.risk].sortFactor || "", "", ]; @@ -204,62 +154,65 @@ export const AdoptionCandidateTable: React.FC = () => { const rows: IRow[] = []; currentPageItems.forEach((item) => { - const isSelected = isApplicationSelected(item.application); + // const isSelected = isApplicationSelected(item.application); rows.push({ [ENTITY_FIELD]: item, - selected: isSelected, + // selected: isSelected, cells: [ { - title: item.application.name, + title: item.application?.name || "N/A", }, { - title: item.review?.businessCriticality, - }, - { - title: item.review?.workPriority, + title: item.archetype?.name || "N/A", }, + // { + // title: item.review?.businessCriticality, + // }, + // { + // title: item.review?.workPriority, + // }, { title: item.confidence, }, - { - title: ( - <> - {item.review && - (EFFORT_ESTIMATE_LIST[item.review.effortEstimate] - ? t(EFFORT_ESTIMATE_LIST[item.review.effortEstimate].i18Key) - : item.review.effortEstimate)} - - ), - }, + // { + // title: ( + // <> + // {item.review && + // (EFFORT_ESTIMATE_LIST[item.review.effortEstimate] + // ? t(EFFORT_ESTIMATE_LIST[item.review.effortEstimate].i18Key) + // : item.review.effortEstimate)} + // + // ), + // }, { title: , }, - { - title: ( - <> - {item.review ? ( - - ) : ( - - )} - - ), - }, + // { + // title: ( + // <> + // {item.review ? ( + // + // ) : ( + // + // )} + // + // ), + // }, ], }); }); - const selectRow = ( - event: React.FormEvent, - isSelected: boolean, - rowIndex: number, - rowData: IRowData, - extraData: IExtraData - ) => { - const row = getRow(rowData); - toggleApplicationSelected(row.application); - }; + // const selectRow = ( + // event: React.FormEvent, + // isSelected: boolean, + // rowIndex: number, + // rowData: IRowData, + // extraData: IExtraData + // ) => { + // const row = getRow(rowData); + // toggleApplicationSelected(row.application); + // }; const handleOnClearAllFilters = () => { setFilterValues({}); }; @@ -269,13 +222,13 @@ export const AdoptionCandidateTable: React.FC = () => { paginationProps={paginationProps} paginationIdPrefix="adoption-candidate" variant={TableVariant.compact} - count={allApplications.length} + count={assessments.length} sortBy={sortBy} onSort={onSort} cells={columns} rows={rows} - onSelect={selectRow} - canSelectAll={false} + // onSelect={selectRow} + // canSelectAll={false} isLoading={false} filtersApplied={false} toolbarClearAllFilters={handleOnClearAllFilters} @@ -286,16 +239,16 @@ export const AdoptionCandidateTable: React.FC = () => { setFilterValues={setFilterValues} /> } - toolbarBulkSelector={ - item.application)} - onSelectMultiple={selectMultipleApplications} - /> - } + // toolbarBulkSelector={ + // item.application)} + // onSelectMultiple={selectMultipleApplications} + // /> + // } /> ); }; diff --git a/client/src/app/pages/reports/reports.tsx b/client/src/app/pages/reports/reports.tsx index dcc23d17a3..7bb470367a 100644 --- a/client/src/app/pages/reports/reports.tsx +++ b/client/src/app/pages/reports/reports.tsx @@ -1,22 +1,12 @@ import React, { useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; import { - Bullseye, - Button, - ButtonVariant, Card, CardBody, - CardExpandableContent, CardHeader, CardTitle, - MenuToggle, PageSection, PageSectionVariants, - Popover, - Select, - SelectOption, - Split, - SplitItem, Stack, StackItem, Text, @@ -24,7 +14,6 @@ import { ToggleGroup, ToggleGroupItem, } from "@patternfly/react-core"; -import HelpIcon from "@patternfly/react-icons/dist/esm/icons/help-icon"; import { Questionnaire } from "@app/api/models"; import { useFetchApplications } from "@app/queries/applications"; @@ -37,8 +26,8 @@ import { StateError } from "@app/components/StateError"; import { ApplicationSelectionContextProvider } from "./application-selection-context"; import { Landscape } from "./components/landscape"; -import { AdoptionPlan } from "./components/adoption-plan"; -import { IdentifiedRisksTable } from "./components/identified-risks-table"; +import { AdoptionCandidateTable } from "./components/adoption-candidate-table/adoption-candidate-table"; +import { AdoptionCandidateGraph } from "./components/adoption-candidate-graph"; const ALL_QUESTIONNAIRES = -1; @@ -144,55 +133,55 @@ export const Reports: React.FC = () => { - setIsQuestionnaireSelectOpen(false) - } - toggle={(toggleRef) => ( - { - setIsQuestionnaireSelectOpen( - !isQuestionnaireSelectOpen - ); - }} - isExpanded={isQuestionnaireSelectOpen} - > - {selectedQuestionnaireId === ALL_QUESTIONNAIRES - ? "All questionnaires" - : questionnairesById[selectedQuestionnaireId] - ?.name} - - )} - shouldFocusToggleOnSelect - > - - All questionnaires - - {...answeredQuestionnaires.map( - (answeredQuestionnaire) => ( - - {answeredQuestionnaire.name} - - ) - )} - - ), - }} + // actions={{ + // hasNoOffset: false, + // actions: ( + // + // ), + // }} > {t("terms.currentLandscape")} @@ -252,15 +241,15 @@ export const Reports: React.FC = () => { - {/* {isAdoptionCandidateTable ? ( + {isAdoptionCandidateTable ? ( ) : ( - )} */} + )} - + {/* setAdoptionPlanOpen((current) => !current)} @@ -297,8 +286,8 @@ export const Reports: React.FC = () => { - - + */} + {/* setIsRiskCardOpen((current) => !current)} @@ -323,7 +312,7 @@ export const Reports: React.FC = () => { - + */} diff --git a/client/src/app/pages/review/review-page.tsx b/client/src/app/pages/review/review-page.tsx index a8f86908e1..9a08148015 100644 --- a/client/src/app/pages/review/review-page.tsx +++ b/client/src/app/pages/review/review-page.tsx @@ -12,7 +12,6 @@ import { import BanIcon from "@patternfly/react-icons/dist/esm/icons/ban-icon"; import { Paths, ReviewRoute } from "@app/Paths"; -import { ApplicationDetails } from "./components/application-details"; import { ReviewForm } from "./components/review-form"; import { SimpleEmptyState } from "@app/components/SimpleEmptyState"; import { ConditionalRender } from "@app/components/ConditionalRender"; @@ -39,9 +38,6 @@ const ReviewPage: React.FC = () => { const { review, fetchError, isFetching } = useFetchReviewById( isArchetype ? archetype?.review?.id : application?.review?.id ); - console.log("archetype.review", archetype?.review?.id); - console.log("reviewl", review); - console.log("isFetchign", isFetching); const assessment = undefined; const breadcrumbs = [ ...(isArchetype @@ -103,12 +99,12 @@ const ReviewPage: React.FC = () => {
- + {/* - + */}