From 925af84c4676cc0d550ca2288ee6ab4248dba667 Mon Sep 17 00:00:00 2001 From: Ian Bolton Date: Wed, 29 Nov 2023 18:09:20 -0500 Subject: [PATCH 1/3] :bug: Flip embedded/managed logic for dependency management col (#1571) - Correctly display the managed value - Resolves https://issues.redhat.com/browse/MTA-1740 Signed-off-by: ibolton336 Co-authored-by: Scott Dickerson --- client/src/app/pages/dependencies/dependency-apps-table.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/app/pages/dependencies/dependency-apps-table.tsx b/client/src/app/pages/dependencies/dependency-apps-table.tsx index d4041788a1..b2e6d9e4d3 100644 --- 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 {isJavaDependency ? "Managed" : "Embedded"}; + return {isJavaDependency ? "Embedded" : "Managed"}; }; const DependencyVersionColumn = ({ From 1293959f18e3f5c609da26ca147d811bbfc7954d Mon Sep 17 00:00:00 2001 From: Ian Bolton Date: Thu, 30 Nov 2023 10:25:56 -0500 Subject: [PATCH 2/3] :bug: Fix edit review message for apps (#1575) https://issues.redhat.com/browse/MTA-1751 Signed-off-by: ibolton336 --- client/public/locales/en/translation.json | 1 + .../applications/applications-table/applications-table.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json index cfa6b25d21..9743456fd0 100644 --- a/client/public/locales/en/translation.json +++ b/client/public/locales/en/translation.json @@ -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 index 7afc874fbd..94dd73eafa 100644 --- 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")} From 835bf11a7d03b8a87456ee12a8f53bf9efa6c305 Mon Sep 17 00:00:00 2001 From: Ian Bolton Date: Thu, 30 Nov 2023 10:56:39 -0500 Subject: [PATCH 3/3] :bug: fix broken translation text (#1576) https://issues.redhat.com/browse/MTA-1753 Signed-off-by: ibolton336 --- client/public/locales/en/translation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json index 9743456fd0..5cd82e4e57 100644 --- 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}} below:" }, "title": {