Merge branch 'main' into mta-1721-3

konveyor · Feb 19, 2024 · 39194e3 · 39194e3
2 parents 1761bda + 9b8a0ff
commit 39194e3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git 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
@@ -85,6 +85,15 @@ export const SetMode: React.FC<ISetMode> = ({ isSingleApp, isModeValid }) => {
           <p>{t("wizard.label.notAllAnalyzableDetails")}</p>
         </Alert>
       )}
+      {mode === "source-code" && (
+        <Alert
+          variant="info"
+          isInline
+          title={t("wizard.alert.sourceMode.title")}
+        >
+          <p>{t("wizard.alert.sourceMode.description")}</p>
+        </Alert>
+      )}
       {mode === "binary-upload" && <UploadBinary />}
     </Form>
   );

diff --git 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 = () => {
 
                       <Td isActionCell id="pencil-action">
                         {applicationWriteAccess && (
-                          <Button
-                            variant="plain"
-                            icon={<PencilAltIcon />}
-                            onClick={() =>
-                              setSaveApplicationModalState(application)
-                            }
-                          />
+                          <Tooltip content={t("actions.edit")}>
+                            <Button
+                              variant="plain"
+                              icon={<PencilAltIcon />}
+                              onClick={() =>
+                                setSaveApplicationModalState(application)
+                              }
+                            />
+                          </Tooltip>
                         )}
                       </Td>
                       <Td isActionCell id="row-actions">