From 6217116e9c8c7d0481d12ae2b0f7e83940f88724 Mon Sep 17 00:00:00 2001 From: Ian Bolton Date: Wed, 14 Feb 2024 13:54:55 -0500 Subject: [PATCH 1/5] :bug: Add excludeFor example for questionnaire (#1684) Resolves https://issues.redhat.com/browse/MTA-1965 Signed-off-by: ibolton336 --- .../templates/questionnaire-template.yaml | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/client/public/templates/questionnaire-template.yaml b/client/public/templates/questionnaire-template.yaml index 4163e6edc5..b7f6913645 100644 --- a/client/public/templates/questionnaire-template.yaml +++ b/client/public/templates/questionnaire-template.yaml @@ -58,7 +58,6 @@ sections: risk: unknown rationale: Lack of clarity on architecture can lead to unplanned issues. mitigation: Conduct an architectural review. - - order: 3 text: Is your application's data storage cloud-optimized? explanation: Evaluate if the data storage solution is optimized for cloud usage. @@ -81,6 +80,30 @@ sections: risk: yellow rationale: Hybrid solutions may have integration complexities. mitigation: Evaluate and optimize cloud integration points. + - order: 4 + text: Are you currently using any form of container orchestration? + explanation: Determine if the application utilizes container orchestration tools like Kubernetes, Docker Swarm, etc. + excludeFor: + - category: Deployment + tag: Serverless + - category: Architecture + tag: Monolith + answers: + - order: 1 + text: Kubernetes + risk: green + rationale: Kubernetes is a robust orchestrator for container management. + mitigation: Ensure Kubernetes configurations are optimized for cloud. + - order: 2 + text: Docker Swarm + risk: green + rationale: Docker Swarm provides a simpler, yet effective, orchestration. + mitigation: Validate that Docker Swarm meets all cloud scalability requirements. + - order: 3 + text: No Container Orchestration + risk: yellow + rationale: Lack of container orchestration can hinder cloud adaptability. + mitigation: Explore container orchestration options for better cloud integration. thresholds: red: 1 yellow: 30 From 9be2ac1f5a3df801179c93bfb2f35f85e57cfa22 Mon Sep 17 00:00:00 2001 From: Ian Bolton Date: Fri, 16 Feb 2024 13:23:08 -0500 Subject: [PATCH 2/5] :bug: Fix wave subtable pagination (#1689) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves https://issues.redhat.com/browse/MTA-1790 Screenshot 2024-02-15 at 2 09 40 PM Screenshot 2024-02-15 at 2 09 08 PM Screenshot 2024-02-15 at 2 09 01 PM Signed-off-by: Ian Bolton --- .../components/stakeholders-table.tsx | 21 ++++++++++++++----- .../components/wave-applications-table.tsx | 21 ++++++++++++++----- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/client/src/app/pages/migration-waves/components/stakeholders-table.tsx b/client/src/app/pages/migration-waves/components/stakeholders-table.tsx index 7aeae65abf..e40eac74e3 100644 --- a/client/src/app/pages/migration-waves/components/stakeholders-table.tsx +++ b/client/src/app/pages/migration-waves/components/stakeholders-table.tsx @@ -58,11 +58,14 @@ export const WaveStakeholdersTable: React.FC = ({ - + {migrationWave.allStakeholders.length > 9 && ( + + )} @@ -116,6 +119,14 @@ export const WaveStakeholdersTable: React.FC = ({ + {migrationWave.allStakeholders.length > 9 && ( + + )} ); }; diff --git a/client/src/app/pages/migration-waves/components/wave-applications-table.tsx b/client/src/app/pages/migration-waves/components/wave-applications-table.tsx index 94b645a1f1..f56baa1a09 100644 --- a/client/src/app/pages/migration-waves/components/wave-applications-table.tsx +++ b/client/src/app/pages/migration-waves/components/wave-applications-table.tsx @@ -73,11 +73,14 @@ export const WaveApplicationsTable: React.FC = ({ - + {migrationWave.fullApplications.length > 9 && ( + + )} @@ -155,6 +158,14 @@ export const WaveApplicationsTable: React.FC = ({ + {migrationWave.fullApplications.length > 9 && ( + + )} ); }; From 8a630d93c592211f28e62b4550e453b0e92126fd Mon Sep 17 00:00:00 2001 From: Ian Bolton Date: Fri, 16 Feb 2024 14:40:00 -0500 Subject: [PATCH 3/5] :bug: Capitalize first letter of source names (#1686) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Screenshot 2024-02-14 at 1 47 42 PM Capitalized source names - previously assessment and archetype sources were lowercase which led to a confusing UX. Motivated by https://github.com/konveyor/tackle2-hub/pull/603 incoming changes. Signed-off-by: Ian Bolton --- .../components/application-tags/application-tags.tsx | 3 ++- client/src/app/utils/utils.ts | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/app/pages/applications/components/application-tags/application-tags.tsx b/client/src/app/pages/applications/components/application-tags/application-tags.tsx index ae7595e2f2..c33f41a63d 100644 --- a/client/src/app/pages/applications/components/application-tags/application-tags.tsx +++ b/client/src/app/pages/applications/components/application-tags/application-tags.tsx @@ -29,6 +29,7 @@ import { import { useLegacyFilterState } from "@app/hooks/useLegacyFilterState"; import { useHistory } from "react-router-dom"; import { ItemTagLabel } from "../../../../components/labels/item-tag-label/item-tag-label"; +import { capitalizeFirstLetter } from "@app/utils/utils"; interface TagWithSource extends Tag { source?: string; @@ -216,7 +217,7 @@ export const ApplicationTags: React.FC = ({ component="h3" className={`${spacing.mtSm} ${spacing.mbSm} ${textStyles.fontSizeMd}`} > - {source === "" ? "Manual" : source} + {source === "" ? "Manual" : capitalizeFirstLetter(source)} {Array.from(tagCategoriesInThisSource).map((tagCategory) => { diff --git a/client/src/app/utils/utils.ts b/client/src/app/utils/utils.ts index 7e7a9a0e35..607dc0d1c3 100644 --- a/client/src/app/utils/utils.ts +++ b/client/src/app/utils/utils.ts @@ -189,3 +189,6 @@ export const collapseSpacesAndCompare = ( return a.localeCompare(b, locale); }; + +export const capitalizeFirstLetter = (str: string) => + str.charAt(0).toUpperCase() + str.slice(1); From ea6e85908fcfeea5f9a650c23edfb5e5bb3fec4c Mon Sep 17 00:00:00 2001 From: Ian Bolton Date: Mon, 19 Feb 2024 13:43:53 -0500 Subject: [PATCH 4/5] :sparkles: Improve documentation for source analysis mode (#1654) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Screenshot 2024-01-04 at 12 05 39 PM Signed-off-by: ibolton336 --- client/public/locales/en/translation.json | 6 ++++++ .../app/pages/applications/analysis-wizard/set-mode.tsx | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json index f97c91fc29..01fd411fcc 100644 --- a/client/public/locales/en/translation.json +++ b/client/public/locales/en/translation.json @@ -486,6 +486,12 @@ "required": "This field is required." }, "wizard": { + "alert": { + "sourceMode": { + "title": "Source Code Mode", + "description": "This mode focuses on analyzing the source code. Language-specific dependency configurations, like in Java's POM files, are not the primary focus and may not be fully analyzed." + } + }, "composed": { "enable": "Enable {{what}}", "excluded": "Excluded {{what}}", diff --git a/client/src/app/pages/applications/analysis-wizard/set-mode.tsx b/client/src/app/pages/applications/analysis-wizard/set-mode.tsx index 20c837ce87..d3294d44aa 100644 --- a/client/src/app/pages/applications/analysis-wizard/set-mode.tsx +++ b/client/src/app/pages/applications/analysis-wizard/set-mode.tsx @@ -85,6 +85,15 @@ export const SetMode: React.FC = ({ isSingleApp, isModeValid }) => {

{t("wizard.label.notAllAnalyzableDetails")}

)} + {mode === "source-code" && ( + +

{t("wizard.alert.sourceMode.description")}

+ + )} {mode === "binary-upload" && } ); From 9b8a0ff8ce48ff41aeccdb1d367f2c92e83325fd Mon Sep 17 00:00:00 2001 From: Maayan Hadasi <60384172+mguetta1@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:23:27 +0200 Subject: [PATCH 5/5] :bug: Adding tooltip to PencilAltIcon (#1688) Resolves: https://issues.redhat.com/browse/MTA-1468 --------- Signed-off-by: Maayan Hadasi --- .../applications-table/applications-table.tsx | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) 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 de45d031ae..c13ac32e57 100644 --- a/client/src/app/pages/applications/applications-table/applications-table.tsx +++ b/client/src/app/pages/applications/applications-table/applications-table.tsx @@ -17,6 +17,7 @@ import { MenuToggle, MenuToggleElement, Modal, + Tooltip, } from "@patternfly/react-core"; import { PencilAltIcon, TagIcon, EllipsisVIcon } from "@patternfly/react-icons"; import { @@ -359,9 +360,8 @@ export const ApplicationsTable: React.FC = () => { selectOptions: [ ...new Set( applications - .flatMap( - (application) => - application?.archetypes?.map((archetype) => archetype.name) + .flatMap((application) => + application?.archetypes?.map((archetype) => archetype.name) ) .filter(Boolean) ), @@ -948,13 +948,15 @@ export const ApplicationsTable: React.FC = () => { {applicationWriteAccess && ( -