Merge branch 'main' into mta-1858

konveyor · Dec 12, 2023 · 1ad068b · 1ad068b
2 parents dec40fa + dc9ee3a
commit 1ad068b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -1015,6 +1015,7 @@ export const ApplicationsTable: React.FC = () => {
                               title: t("actions.delete"),
                               onClick: () =>
                                 setApplicationsToDelete([application]),
+                              isDisabled: application.migrationWave !== null,
                             },
                             {
                               title: t("actions.manageDependencies"),

diff --git a/client/src/app/pages/reports/components/application-landscape/application-landscape.tsx b/client/src/app/pages/reports/components/application-landscape/application-landscape.tsx
@@ -87,7 +87,7 @@ const aggregateRiskData = (
     red: high,
     unknown,
     unassessed,
-    applicationsCount: processedAppIds.size,
+    applicationsCount: applications.length,
   };
 };
 

diff --git a/client/src/app/queries/questionnaires.ts b/client/src/app/queries/questionnaires.ts
@@ -160,6 +160,7 @@ export const downloadQuestionnaire = async (
     delete yamlData.updateUser;
     delete yamlData.createTime;
     delete yamlData.id;
+    delete yamlData.required;
 
     const newYamlData = yaml.dump(yamlData);