Merge branch 'main' into mta-1752

konveyor · Nov 30, 2023 · fd01f69 · fd01f69
2 parents c666129 + 835bf11
commit fd01f69
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
@@ -113,7 +113,7 @@
       "maxfileSize": "Max file size of 1MB exceeded. Upload a smaller file.",
       "dragAndDropFile": "Drag and drop your file here or upload one.",
       "uploadYamlFile": "Upload your YAML file",
-      "deleteQuestionnire": "Deleting a questionnaire will cascade into the deletion of all answered questionnaires associated to applications and/or archetypes.",
+      "deleteQuestionnaire": "Deleting a questionnaire will cascade into the deletion of all answered questionnaires associated to applications and/or archetypes.",
       "confirmDeletion": "Confirm deletion by typing <1>{{nameToDelete}}</1> below:"
     },
     "title": {
@@ -192,6 +192,7 @@
     "overrideAssessmentConfirmation": "Do you want to create a dedicated assessment for this application and override the inherited archetype assessment(s)?",
     "overrideArchetypeReviewDescription": "The application {{name}} already is associated with archetypes: {{what}}.",
     "overrideArchetypeReviewConfirmation": "Do you want to create a dedicated review for this application and override the inherited archetype review?",
+    "editApplicationReviewConfirmation": "This application has already been reviewed. Do you want to continue?",
     "editArchetypeReviewConfirmation": "This archetype has already been reviewed. Do you want to continue?",
     "reasonForError": "The reported reason for the error:",
     "reviewInstructions": "Use this section to provide your assessment of the possible migration/modernization plan and effort estimation.",

diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -1240,7 +1240,7 @@ export const ApplicationsTable: React.FC = () => {
           })}
           titleIconVariant={"warning"}
           isOpen={reviewToEdit !== null}
-          message={t("message.overrideReviewConfirmation")}
+          message={t("message.editApplicationReviewConfirmation")}
           confirmBtnVariant={ButtonVariant.primary}
           confirmBtnLabel={t("actions.continue")}
           cancelBtnLabel={t("actions.cancel")}

diff --git a/client/src/app/pages/dependencies/dependency-apps-table.tsx b/client/src/app/pages/dependencies/dependency-apps-table.tsx
@@ -250,7 +250,7 @@ const DependencyManagementColumn = ({
   const isJavaFile = appDependency.dependency.name.endsWith(".jar");
   const isJavaDependency = hasJavaLabel && isJavaFile;
 
-  return <TextContent>{isJavaDependency ? "Managed" : "Embedded"}</TextContent>;
+  return <TextContent>{isJavaDependency ? "Embedded" : "Managed"}</TextContent>;
 };
 
 const DependencyVersionColumn = ({