🐛 inherit review data from multiple archetypes (#1493)

https://issues.redhat.com/browse/MTA-1382 https://issues.redhat.com/browse/MTA-1537 --------- Signed-off-by: ibolton336 <[email protected]>
konveyor · Oct 30, 2023 · 2ffa3e8 · 2ffa3e8
1 parent 319f8d2
commit 2ffa3e8
Show file tree

Hide file tree

Showing 8 changed files with 225 additions and 71 deletions.
diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
@@ -259,6 +259,7 @@
     "category": "Category",
     "color": "Color",
     "comments": "Comments",
+    "commentsFromApplication": "Application comments",
     "completed": "Completed",
     "confidence": "Confidence",
     "connected": "Connected",
@@ -354,8 +355,10 @@
     "reports": "Reports",
     "repositoryType": "Repository type",
     "review": "Review",
+    "reviews": "Reviews",
     "reviewComments": "Review comments",
     "risk": "Risk",
+    "riskFromApplication": "Application risk",
     "scheduled": "Scheduled",
     "select": "Select",
     "settingsAllowApps": "Allow reviewing applications without running an assessment first",

diff --git a/client/src/app/api/rest.ts b/client/src/app/api/rest.ts
@@ -160,7 +160,7 @@ export const deleteApplicationDependency = (
 // Reviews
 
 export const getReviews = (): Promise<Review[]> => {
-  return axios.get(`${REVIEWS}`);
+  return axios.get(`${REVIEWS}`).then((response) => response.data);
 };
 
 export const getReviewById = (id: number | string): Promise<Review> => {

diff --git a/...rc/app/pages/applications/applications-table-assessment/applications-table-assessment.tsx b/...rc/app/pages/applications/applications-table-assessment/applications-table-assessment.tsx
@@ -88,6 +88,7 @@ import { NoDataEmptyState } from "@app/components/NoDataEmptyState";
 import { ConditionalTooltip } from "@app/components/ConditionalTooltip";
 import { getAssessmentsByItemId } from "@app/api/rest";
 import { ApplicationDependenciesForm } from "@app/components/ApplicationDependenciesFormContainer/ApplicationDependenciesForm";
+import { useFetchArchetypes } from "@app/queries/archetypes";
 
 export const ApplicationsTable: React.FC = () => {
   const { t } = useTranslation();
@@ -147,6 +148,13 @@ export const ApplicationsTable: React.FC = () => {
     refetch: fetchApplications,
   } = useFetchApplications();
 
+  const {
+    archetypes,
+    isFetching: isFetchingArchetypes,
+    error: archetypesFetchError,
+    refetch: fetchArchetypes,
+  } = useFetchArchetypes();
+
   const onDeleteApplicationSuccess = (appIDCount: number) => {
     pushNotification({
       title: t("toastr.success.applicationDeleted", {
@@ -515,7 +523,6 @@ export const ApplicationsTable: React.FC = () => {
       );
     }
   };
-
   return (
     <ConditionalRender
       when={isFetchingApplications && !(applications || applicationsFetchError)}
@@ -618,6 +625,19 @@ export const ApplicationsTable: React.FC = () => {
           >
             <Tbody>
               {currentPageItems?.map((application, rowIndex) => {
+                const isAppReviewed = !!application.review;
+                const applicationArchetypes = application.archetypes?.map(
+                  (archetypeRef) => {
+                    return archetypes.find(
+                      (archetype) => archetype.id === archetypeRef.id
+                    );
+                  }
+                );
+
+                const hasReviewedArchetype = applicationArchetypes?.some(
+                  (archetype) => !!archetype?.review
+                );
+
                 return (
                   <Tr
                     key={application.name}
@@ -669,7 +689,9 @@ export const ApplicationsTable: React.FC = () => {
                       >
                         <IconedStatus
                           preset={
-                            application.review ? "Completed" : "NotStarted"
+                            isAppReviewed || hasReviewedArchetype
+                              ? "Completed"
+                              : "NotStarted"
                           }
                         />
                       </Td>

diff --git a/...s/applications/components/application-assessment-status/application-assessment-status.tsx b/...s/applications/components/application-assessment-status/application-assessment-status.tsx
@@ -6,6 +6,7 @@ import { EmptyTextMessage } from "@app/components/EmptyTextMessage";
 import { Application } from "@app/api/models";
 import { IconedStatus } from "@app/components/IconedStatus";
 import { useFetchAssessmentsByItemId } from "@app/queries/assessments";
+import { useFetchQuestionnaires } from "@app/queries/questionnaires";
 
 export interface ApplicationAssessmentStatusProps {
   application: Application;
@@ -22,8 +23,12 @@ export const ApplicationAssessmentStatus: React.FC<
     isFetching: isFetchingAssessmentsById,
     fetchError,
   } = useFetchAssessmentsByItemId(false, application.id);
-
-  if (application?.assessed) {
+  const { questionnaires } = useFetchQuestionnaires();
+  const requiredQuestionnaireExists = questionnaires?.some(
+    (q) => q.required === true
+  );
+  //NOTE: Application.assessed is true if an app is assigned to an archetype and no required questionnaires exist
+  if (application?.assessed && requiredQuestionnaireExists) {
     return <IconedStatus preset="Completed" />;
   }
 

diff --git a/...pplications/components/application-detail-drawer/application-detail-drawer-assessment.tsx b/...pplications/components/application-detail-drawer/application-detail-drawer-assessment.tsx
@@ -14,14 +14,13 @@ import {
 import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";
 
 import { EmptyTextMessage } from "@app/components/EmptyTextMessage";
-import { EFFORT_ESTIMATE_LIST, PROPOSED_ACTION_LIST } from "@app/Constants";
 import { Ref, Task } from "@app/api/models";
 import {
   ApplicationDetailDrawer,
   IApplicationDetailDrawerProps,
 } from "./application-detail-drawer";
-import { useFetchReviewById } from "@app/queries/reviews";
 import { ReviewedArchetypeItem } from "./reviewed-archetype-item";
+import { ReviewFields } from "./review-fields";
 import { RiskLabel } from "@app/components/RiskLabel";
 
 export interface IApplicationDetailDrawerAssessmentProps
@@ -34,11 +33,6 @@ export const ApplicationDetailDrawerAssessment: React.FC<
 > = ({ application, onCloseClick, task }) => {
   const { t } = useTranslation();
 
-  const { review: appReview } = useFetchReviewById(application?.review?.id);
-  const notYetReviewed = (
-    <EmptyTextMessage message={t("terms.notYetReviewed")} />
-  );
-
   return (
     <ApplicationDetailDrawer
       application={application}
@@ -88,71 +82,16 @@ export const ApplicationDetailDrawerAssessment: React.FC<
                 )}
               </DescriptionListDescription>
             </DescriptionListGroup>
-            <TextContent className={spacing.mtLg}>
-              <Title headingLevel="h3" size="md">
-                {t("terms.applicationReview")}
-              </Title>
-            </TextContent>
-            <DescriptionListGroup>
-              <DescriptionListTerm>
-                {t("terms.proposedAction")}
-              </DescriptionListTerm>
-              <DescriptionListDescription cy-data="proposed-action">
-                {appReview ? (
-                  <Label>
-                    {PROPOSED_ACTION_LIST[appReview.proposedAction]
-                      ? t(PROPOSED_ACTION_LIST[appReview.proposedAction].i18Key)
-                      : appReview.proposedAction}
-                  </Label>
-                ) : (
-                  notYetReviewed
-                )}
-              </DescriptionListDescription>
-            </DescriptionListGroup>
-            <DescriptionListGroup>
-              <DescriptionListTerm>
-                {t("terms.effortEstimate")}
-              </DescriptionListTerm>
-              <DescriptionListDescription cy-data="effort-estimate">
-                {appReview
-                  ? EFFORT_ESTIMATE_LIST[appReview.effortEstimate]
-                    ? t(EFFORT_ESTIMATE_LIST[appReview.effortEstimate].i18Key)
-                    : appReview.effortEstimate
-                  : notYetReviewed}
-              </DescriptionListDescription>
-            </DescriptionListGroup>
-            <DescriptionListGroup>
-              <DescriptionListTerm>
-                {t("terms.businessCriticality")}
-              </DescriptionListTerm>
-              <DescriptionListDescription cy-data="business-criticality">
-                {appReview?.businessCriticality || notYetReviewed}
-              </DescriptionListDescription>
-            </DescriptionListGroup>
-            <DescriptionListGroup>
-              <DescriptionListTerm>
-                {t("terms.workPriority")}
-              </DescriptionListTerm>
-              <DescriptionListDescription cy-data="work-priority">
-                {appReview?.workPriority || notYetReviewed}
-              </DescriptionListDescription>
-            </DescriptionListGroup>
-            <DescriptionListGroup>
-              <DescriptionListTerm>{t("terms.risk")}</DescriptionListTerm>
-              <DescriptionListDescription cy-data="risk">
-                <RiskLabel risk={application?.risk || "unknown"} />
-              </DescriptionListDescription>
-            </DescriptionListGroup>
           </DescriptionList>
           <TextContent className={spacing.mtLg}>
             <Title headingLevel="h3" size="md">
-              {t("terms.reviewComments")}
+              {t("terms.riskFromApplication")}
             </Title>
-            <Text component="small" cy-data="review-comments">
-              {appReview?.comments || notYetReviewed}
+            <Text component="small" cy-data="comments">
+              <RiskLabel risk={application?.risk || "unknown"} />
             </Text>
             <Title headingLevel="h3" size="md">
-              {t("terms.comments")}
+              {t("terms.commentsFromApplication")}
             </Title>
             <Text component="small" cy-data="comments">
               {application?.comments || (
@@ -162,6 +101,7 @@ export const ApplicationDetailDrawerAssessment: React.FC<
           </TextContent>
         </>
       }
+      reviewsTabContent={<ReviewFields application={application} />}
     />
   );
 };

diff --git a/...app/pages/applications/components/application-detail-drawer/application-detail-drawer.tsx b/...app/pages/applications/components/application-detail-drawer/application-detail-drawer.tsx
@@ -35,13 +35,15 @@ export interface IApplicationDetailDrawerProps
   detailsTabMainContent: React.ReactNode;
   reportsTabContent?: React.ReactNode;
   factsTabContent?: React.ReactNode;
+  reviewsTabContent?: React.ReactNode;
 }
 
 enum TabKey {
   Details = 0,
   Tags,
   Reports,
   Facts,
+  Reviews,
 }
 
 export const ApplicationDetailDrawer: React.FC<
@@ -53,6 +55,7 @@ export const ApplicationDetailDrawer: React.FC<
   detailsTabMainContent,
   reportsTabContent = null,
   factsTabContent = null,
+  reviewsTabContent = null,
 }) => {
   const { t } = useTranslation();
   const [activeTabKey, setActiveTabKey] = React.useState<TabKey>(
@@ -169,6 +172,14 @@ export const ApplicationDetailDrawer: React.FC<
             {factsTabContent}
           </Tab>
         ) : null}
+        {reviewsTabContent ? (
+          <Tab
+            eventKey={TabKey.Reviews}
+            title={<TabTitleText>{t("terms.reviews")}</TabTitleText>}
+          >
+            {reviewsTabContent}
+          </Tab>
+        ) : null}
       </Tabs>
     </PageDrawerContent>
   );