Merge branch 'main' into chore/1241-replace-deprecated-pf-dropdown

konveyor · Sep 22, 2023 · 5cee8d3 · 5cee8d3
2 parents 30c240e + 48dd6fd
commit 5cee8d3
Show file tree

Hide file tree

Showing 22 changed files with 575 additions and 144 deletions.
diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
@@ -71,7 +71,8 @@
     "orange": "Orange",
     "purple": "Purple",
     "red": "Red",
-    "teal": "Teal"
+    "teal": "Teal",
+    "yellow": "Yellow"
   },
   "composed": {
     "add": "Add {{what}}",
@@ -243,7 +244,6 @@
     "businessServices": "Business services",
     "canceled": "Canceled",
     "category": "Category",
-    "cloudNativeReady": "Cloud-native ready",
     "color": "Color",
     "comments": "Comments",
     "completed": "Completed",
@@ -311,7 +311,6 @@
     "member(s)": "Member(s)",
     "memberCount": "Member count",
     "message": "Message",
-    "modernizable": "Modernizable",
     "migrationWave": "Migration wave",
     "migrationWaves": "Migration waves",
     "migrationWave(s)": "Migration wave(s)",
@@ -322,7 +321,6 @@
     "notConnected": "Not connected",
     "notReviewed": "Not reviewed",
     "notStarted": "Not started",
-    "notYetAssessed": "Not yet assessed",
     "notYetReviewed": "Not yet reviewed",
     "other": "Other",
     "owner": "Owner",
@@ -384,7 +382,6 @@
     "unassessed": "Unassessed",
     "unassigned": "Not yet assigned",
     "unknown": "Unknown",
-    "unsuitableForContainers": "Unsuitable for containers",
     "uploadApplicationFile": "Upload your application file",
     "uploadYamlFile": "Upload your YAML file",
     "url": "URL",

diff --git a/client/public/locales/es/translation.json b/client/public/locales/es/translation.json
@@ -55,7 +55,8 @@
     "green": "Verde",
     "orange": "Naranja",
     "purple": "Morado",
-    "red": "Rojo"
+    "red": "Rojo",
+    "yellow": "Amarillo"
   },
   "composed": {
     "add": "Agregar {{what}}",
@@ -194,7 +195,6 @@
     "businessServices": "Servicios de negocio",
     "canceled": "Cancelado",
     "category": "Categoría",
-    "cloudNativeReady": "Listo para Cloud-native",
     "color": "Color",
     "comments": "Comentarios",
     "completed": "Completado",
@@ -247,13 +247,11 @@
     "member(s)": "Miembro(s)",
     "memberCount": "Número de miembros",
     "message": "Mensaje",
-    "modernizable": "Modernizable",
     "name": "Nombre",
     "northboundDependencies": "Dependencias del norte",
     "notAvailable": "No disponible",
     "notReviewed": "No revisado",
     "notStarted": "No empezado",
-    "notYetAssessed": "No evaluado todavía",
     "notYetReviewed": "No revisado todavía",
     "other": "Otro",
     "owner": "Propietario",
@@ -304,7 +302,6 @@
     "trivialButMigratable": "Trivial pero migrable",
     "unassessed": "No evaluado",
     "unknown": "Desconocido",
-    "unsuitableForContainers": "No apto para contenedores",
     "uploadApplicationFile": "Carga tu archivo con aplicaciones",
     "user": "Usuario",
     "version": "Versión",

diff --git a/client/src/app/api/models.ts b/client/src/app/api/models.ts
@@ -709,8 +709,8 @@ export interface Assessment
   description: string;
   status: AssessmentStatus;
   risk: Risk;
-  stakeholders: Ref[];
-  stakeholderGroups: Ref[];
+  stakeholders?: Ref[];
+  stakeholderGroups?: Ref[];
 }
 export interface CategorizedTag {
   category: TagCategory;
@@ -723,11 +723,6 @@ export interface AssessmentRisk {
   applicationId: number;
   risk: Risk;
 }
-export interface AssessmentRisk {
-  assessmentId: number;
-  applicationId: number;
-  risk: Risk;
-}
 
 export interface AssessmentQuestionRisk {
   category: string;

diff --git a/client/src/app/api/rest.ts b/client/src/app/api/rest.ts
@@ -205,6 +205,9 @@ export const getApplicationSummaryCSV = (id: string): AxiosPromise => {
   });
 };
 
+export const getAssessments = (): Promise<Assessment[]> =>
+  axios.get(ASSESSMENTS).then((response) => response.data);
+
 export const getAssessmentsByItemId = (
   isArchetype: boolean,
   itemId?: number | string

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
@@ -220,8 +220,8 @@ export const ApplicationsTable: React.FC = () => {
         await Promise.all(
           application.assessments.map(async (assessment) => {
             await deleteAssessment({
-              id: assessment.id,
-              name: application.name,
+              assessmentId: assessment.id,
+              applicationName: application.name,
             });
           })
         );

diff --git a/...c/app/pages/assessment-management/import-questionnaire-form/import-questionnaire-form.tsx b/...c/app/pages/assessment-management/import-questionnaire-form/import-questionnaire-form.tsx
@@ -56,12 +56,13 @@ export const ImportQuestionnaireForm: React.FC<
     trigger,
   } = methods;
 
-  const onHandleSuccessfullQuestionnaireCreation = (
-    response: Questionnaire
-  ) => {
+  const onHandleSuccessfulQuestionnaireCreation = (response: Questionnaire) => {
     onSaved(response);
     pushNotification({
-      title: t("toastr.success.questionnaireCreated"),
+      title: t("toastr.success.createWhat", {
+        type: t("terms.questionnaire"),
+        what: response.name,
+      }),
       variant: "success",
     });
     onSaved();
@@ -75,7 +76,7 @@ export const ImportQuestionnaireForm: React.FC<
   };
 
   const { mutate: createQuestionnaire } = useCreateQuestionnaireMutation(
-    onHandleSuccessfullQuestionnaireCreation,
+    onHandleSuccessfulQuestionnaireCreation,
     onHandleFailedQuestionnaireCreation
   );
 

diff --git a/...pp/pages/assessment/components/assessment-actions/components/assessment-actions-table.tsx b/...pp/pages/assessment/components/assessment-actions/components/assessment-actions-table.tsx
@@ -38,6 +38,7 @@ const AssessmentActionsTable: React.FC<AssessmentActionsTableProps> = ({
       <QuestionnairesTable
         application={application}
         archetype={archetype}
+        isReadonly
         questionnaires={archivedQuestionnaires}
         assessments={assessments}
         isFetching={isFetchingQuestionnaires || isFetchingAssessmentsById}

diff --git a/...es/assessment/components/assessment-actions/components/dynamic-assessment-actions-row.tsx b/...es/assessment/components/assessment-actions/components/dynamic-assessment-actions-row.tsx
@@ -180,8 +180,10 @@ const DynamicAssessmentActionsRow: FunctionComponent<
       if (assessment) {
         try {
           await deleteAssessmentAsync({
-            name: assessment.name,
-            id: assessment.id,
+            assessmentId: assessment.id,
+            applicationName: application?.name,
+            applicationId: application?.id,
+            archetypeId: archetype?.id,
           }).then(() => {
             createAssessment();
           });
@@ -257,8 +259,10 @@ const DynamicAssessmentActionsRow: FunctionComponent<
             variant="plain"
             onClick={() => {
               deleteAssessment({
-                id: assessment.id,
-                name: assessment.name,
+                assessmentId: assessment.id,
+                applicationName: application?.name,
+                applicationId: application?.id,
+                archetypeId: archetype?.id,
               });
             }}
           >