Merge branch 'main' into mta-1961

konveyor · Jan 18, 2024 · e28d0b9 · e28d0b9
2 parents 6593690 + 629cb61
commit e28d0b9
Show file tree

Hide file tree

Showing 9 changed files with 64 additions and 58 deletions.
diff --git a/.github/workflows/pr-closed.yaml b/.github/workflows/pr-closed.yaml
@@ -0,0 +1,16 @@
+name: PR Closed
+
+on:
+  pull_request_target:
+    branches:
+      - main
+    types:
+      - closed
+
+jobs:
+  cherry_pick_job:
+    permissions:
+      pull-requests: write
+      contents: write
+    if: github.event.pull_request.merged == true
+    uses: konveyor/release-tools/.github/workflows/cherry-pick.yml@main
diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
@@ -437,6 +437,7 @@
     "teamMember": "team member",
     "ticket": "Ticket",
     "trivialButMigratable": "Trivial but migratable",
+    "unassessedOrUnknown": "Unassessed or unknown",
     "unassessed": "Unassessed",
     "unassigned": "Not yet assigned",
     "unknown": "Unknown",

diff --git a/client/src/app/App.tsx b/client/src/app/App.tsx
@@ -5,9 +5,6 @@ import { AppRoutes } from "./Routes";
 import { DefaultLayout } from "./layout";
 import { NotificationsProvider } from "./components/NotificationsContext";
 
-import "@patternfly/patternfly/patternfly.css";
-import "@patternfly/patternfly/patternfly-addons.css";
-
 import "./app.css";
 
 const App: React.FC = () => {

diff --git a/client/src/app/dayjs.ts b/client/src/app/dayjs.ts
@@ -0,0 +1,10 @@
+import dayjs from "dayjs";
+import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
+import utc from "dayjs/plugin/utc";
+import timezone from "dayjs/plugin/timezone";
+import customParseFormat from "dayjs/plugin/customParseFormat";
+
+dayjs.extend(utc);
+dayjs.extend(timezone);
+dayjs.extend(customParseFormat);
+dayjs.extend(isSameOrBefore);
diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -54,16 +54,12 @@ import keycloak from "@app/keycloak";
 import {
   RBAC,
   RBAC_TYPE,
-  analysisReadScopes,
-  analysisWriteScopes,
+  analysesReadScopes,
   applicationsWriteScopes,
-  assessmentReadScopes,
   assessmentWriteScopes,
   credentialsReadScopes,
-  credentialsWriteScopes,
   dependenciesWriteScopes,
   importsWriteScopes,
-  reviewsReadScopes,
   reviewsWriteScopes,
   tasksReadScopes,
   tasksWriteScopes,
@@ -542,16 +538,12 @@ export const ApplicationsTable: React.FC = () => {
     importWriteAccess = checkAccess(userScopes, importsWriteScopes),
     applicationWriteAccess = checkAccess(userScopes, applicationsWriteScopes),
     assessmentWriteAccess = checkAccess(userScopes, assessmentWriteScopes),
-    analysisWriteAccess = checkAccess(userScopes, analysisWriteScopes),
-    assessmentReadAccess = checkAccess(userScopes, assessmentReadScopes),
     credentialsReadAccess = checkAccess(userScopes, credentialsReadScopes),
-    credentialsWriteAccess = checkAccess(userScopes, credentialsWriteScopes),
     dependenciesWriteAccess = checkAccess(userScopes, dependenciesWriteScopes),
-    analysisReadAccess = checkAccess(userScopes, analysisReadScopes),
+    analysesReadAccess = checkAccess(userScopes, analysesReadScopes),
     tasksReadAccess = checkAccess(userScopes, tasksReadScopes),
     tasksWriteAccess = checkAccess(userScopes, tasksWriteScopes),
-    reviewsWriteAccess = checkAccess(userScopes, reviewsWriteScopes),
-    reviewsReadAccess = checkAccess(userScopes, reviewsReadScopes);
+    reviewsWriteAccess = checkAccess(userScopes, reviewsWriteScopes);
 
   const areAppsInWaves = selectedRows.some(
     (application) => application.migrationWave !== null
@@ -1031,7 +1023,7 @@ export const ApplicationsTable: React.FC = () => {
                                   },
                                 ]
                               : []),
-                            ...(analysisReadAccess && hasExistingAnalysis
+                            ...(analysesReadAccess && hasExistingAnalysis
                               ? [
                                   {
                                     title: t("actions.analysisDetails"),

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
@@ -21,6 +21,7 @@ import {
   Divider,
   Tooltip,
   Label,
+  LabelGroup,
 } from "@patternfly/react-core";
 import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";
 import {
@@ -210,16 +211,18 @@ export const ApplicationDetailDrawer: React.FC<
                     {t("terms.archetypesAssessed")}
                   </DescriptionListTerm>
                   <DescriptionListDescription>
-                    {assessedArchetypes?.length ? (
-                      assessedArchetypes.map((assessedArchetype) => (
-                        <ArchetypeItem
-                          key={assessedArchetype?.id}
-                          archetype={assessedArchetype}
-                        />
-                      ))
-                    ) : (
-                      <EmptyTextMessage message={t("terms.none")} />
-                    )}
+                    <LabelGroup>
+                      {assessedArchetypes?.length ? (
+                        assessedArchetypes.map((assessedArchetype) => (
+                          <ArchetypeItem
+                            key={assessedArchetype?.id}
+                            archetype={assessedArchetype}
+                          />
+                        ))
+                      ) : (
+                        <EmptyTextMessage message={t("terms.none")} />
+                      )}
+                    </LabelGroup>
                   </DescriptionListDescription>
                 </DescriptionListGroup>
 
@@ -228,16 +231,18 @@ export const ApplicationDetailDrawer: React.FC<
                     {t("terms.archetypesReviewed")}
                   </DescriptionListTerm>
                   <DescriptionListDescription>
-                    {reviewedArchetypes?.length ? (
-                      reviewedArchetypes.map((reviewedArchetype) => (
-                        <ArchetypeItem
-                          key={reviewedArchetype?.id}
-                          archetype={reviewedArchetype}
-                        />
-                      ))
-                    ) : (
-                      <EmptyTextMessage message={t("terms.none")} />
-                    )}
+                    <LabelGroup>
+                      {reviewedArchetypes?.length ? (
+                        reviewedArchetypes.map((reviewedArchetype) => (
+                          <ArchetypeItem
+                            key={reviewedArchetype?.id}
+                            archetype={reviewedArchetype}
+                          />
+                        ))
+                      ) : (
+                        <EmptyTextMessage message={t("terms.none")} />
+                      )}
+                    </LabelGroup>
                   </DescriptionListDescription>
                 </DescriptionListGroup>
               </DescriptionList>

diff --git a/client/src/app/pages/reports/components/application-landscape/application-landscape.tsx b/client/src/app/pages/reports/components/application-landscape/application-landscape.tsx
@@ -186,15 +186,15 @@ export const ApplicationLandscape: React.FC<IApplicationLandscapeProps> = ({
             <Donut
               isAssessment={false}
               id="landscape-donut-unassessed"
-              value={landscapeData.unassessed}
+              value={landscapeData.unassessed + landscapeData.unknown}
               total={landscapeData.applicationsCount}
               color={RISK_LIST.unknown.hexColor}
               riskLabel={
                 <Link to={getRisksUrl(["unknown"])}>
                   {`${t("terms.unassessed")}/${t("terms.unknown")}`}
                 </Link>
               }
-              riskTitle={t("terms.unassessed")}
+              riskTitle={t("terms.unassessedOrUnknown")}
             />
           </FlexItem>
         </Flex>

diff --git a/client/src/app/rbac.ts b/client/src/app/rbac.ts
@@ -110,18 +110,7 @@ export const archetypesWriteScopes = [
   "archetypes:delete",
 ];
 
-export const analysisWriteScopes = [
-  "applications.analysis:put",
-  "applications.analysis:post",
-  "applications.analysis:delete",
-  "archetypes.analysis:put",
-  "archetypes.analysis:post",
-  "archetypes.analysis:delete",
-];
-export const analysisReadScopes = [
-  "applications.analysis:get",
-  "archetypes.analysis:get",
-];
+export const analysesReadScopes = ["applications.analyses:get"];
 
 export const assessmentWriteScopes = [
   "applications.assessments:put",

diff --git a/client/src/index.tsx b/client/src/index.tsx
@@ -1,3 +1,6 @@
+import "@patternfly/patternfly/patternfly.css";
+import "@patternfly/patternfly/patternfly-addons.css";
+
 import React from "react";
 import ReactDOM from "react-dom";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
@@ -7,16 +10,9 @@ import ENV from "@app/env";
 import App from "@app/App";
 import reportWebVitals from "@app/reportWebVitals";
 import { KeycloakProvider } from "@app/components/KeycloakProvider";
-import dayjs from "dayjs";
-import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
-import utc from "dayjs/plugin/utc";
-import timezone from "dayjs/plugin/timezone";
-import customParseFormat from "dayjs/plugin/customParseFormat";
 
-dayjs.extend(utc);
-dayjs.extend(timezone);
-dayjs.extend(customParseFormat);
-dayjs.extend(isSameOrBefore);
+import "@app/dayjs";
+import "@app/i18n";
 
 const queryClient = new QueryClient();