From eef4864aaf75f226cb546036bfc5d5dafcad4591 Mon Sep 17 00:00:00 2001
From: "Van J. Wilson" <vwilson@redhat.com>
Date: Thu, 8 Sep 2022 10:09:24 -0400
Subject: [PATCH 1/2] Remove duplicate query field names for Most Common Vulns

---
 .../src/Containers/VulnMgmt/widgets/MostCommonVulnerabilities.js | 1 -
 .../VulnMgmt/widgets/MostCommonVulnerabiltiesInDeployment.js     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/ui/apps/platform/src/Containers/VulnMgmt/widgets/MostCommonVulnerabilities.js b/ui/apps/platform/src/Containers/VulnMgmt/widgets/MostCommonVulnerabilities.js
index 9bba6ecf6b7e8..ab522d50b800b 100644
--- a/ui/apps/platform/src/Containers/VulnMgmt/widgets/MostCommonVulnerabilities.js
+++ b/ui/apps/platform/src/Containers/VulnMgmt/widgets/MostCommonVulnerabilities.js
@@ -42,7 +42,6 @@ const MOST_COMMON_IMAGE_VULNERABILITIES = gql`
             scoreVersion
             isFixable
             deploymentCount
-            imageCount
             summary
             imageCount
             lastScanned
diff --git a/ui/apps/platform/src/Containers/VulnMgmt/widgets/MostCommonVulnerabiltiesInDeployment.js b/ui/apps/platform/src/Containers/VulnMgmt/widgets/MostCommonVulnerabiltiesInDeployment.js
index ddd3b8d4ce6fa..21d49f48fff8d 100644
--- a/ui/apps/platform/src/Containers/VulnMgmt/widgets/MostCommonVulnerabiltiesInDeployment.js
+++ b/ui/apps/platform/src/Containers/VulnMgmt/widgets/MostCommonVulnerabiltiesInDeployment.js
@@ -46,7 +46,6 @@ const MOST_COMMON_IMAGE_VULNERABILITIES = gql`
             scoreVersion
             isFixable
             deploymentCount
-            imageCount
             summary
             imageCount
             lastScanned

From 3e7974e306e2247c6e7d2ad9981b5d0f5b94db83 Mon Sep 17 00:00:00 2001
From: "Van J. Wilson" <vwilson@redhat.com>
Date: Thu, 8 Sep 2022 17:43:52 -0400
Subject: [PATCH 2/2] Remove duplicate fields in cluster VM widget queries

---
 .../VulnMgmt/Dashboard/VulnMgmtDashboardPage.js           | 4 ++--
 ...ities.js => ClustersWithMostClusterVulnerabilities.js} | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename ui/apps/platform/src/Containers/VulnMgmt/widgets/{ClustersWithMostOrchestratorIstioVulnerabilities.js => ClustersWithMostClusterVulnerabilities.js} (98%)

diff --git a/ui/apps/platform/src/Containers/VulnMgmt/Dashboard/VulnMgmtDashboardPage.js b/ui/apps/platform/src/Containers/VulnMgmt/Dashboard/VulnMgmtDashboardPage.js
index 9fb354b3cb285..cdc89735fd1c7 100644
--- a/ui/apps/platform/src/Containers/VulnMgmt/Dashboard/VulnMgmtDashboardPage.js
+++ b/ui/apps/platform/src/Containers/VulnMgmt/Dashboard/VulnMgmtDashboardPage.js
@@ -22,7 +22,7 @@ import FrequentlyViolatedPolicies from '../widgets/FrequentlyViolatedPolicies';
 import RecentlyDetectedImageVulnerabilities from '../widgets/RecentlyDetectedImageVulnerabilities';
 import MostCommonVulnerabilities from '../widgets/MostCommonVulnerabilities';
 import DeploymentsWithMostSeverePolicyViolations from '../widgets/DeploymentsWithMostSeverePolicyViolations';
-import ClustersWithMostOrchestratorIstioVulnerabilities from '../widgets/ClustersWithMostOrchestratorIstioVulnerabilities';
+import ClustersWithMostClusterVulnerabilities from '../widgets/ClustersWithMostClusterVulnerabilities';
 import CvesMenu from './CvesMenu';
 
 const baseEntityMenuTypes = [entityTypes.CLUSTER, entityTypes.NAMESPACE, entityTypes.DEPLOYMENT];
@@ -136,7 +136,7 @@ const VulnDashboardPage = ({ history }) => {
                 <DeploymentsWithMostSeverePolicyViolations limit={DASHBOARD_LIMIT} />
             </div>
             <div className="s-2 xxxl:sx-2">
-                <ClustersWithMostOrchestratorIstioVulnerabilities />
+                <ClustersWithMostClusterVulnerabilities />
             </div>
         </DashboardLayout>
     );
diff --git a/ui/apps/platform/src/Containers/VulnMgmt/widgets/ClustersWithMostOrchestratorIstioVulnerabilities.js b/ui/apps/platform/src/Containers/VulnMgmt/widgets/ClustersWithMostClusterVulnerabilities.js
similarity index 98%
rename from ui/apps/platform/src/Containers/VulnMgmt/widgets/ClustersWithMostOrchestratorIstioVulnerabilities.js
rename to ui/apps/platform/src/Containers/VulnMgmt/widgets/ClustersWithMostClusterVulnerabilities.js
index d1f61358341e3..b56dcdeb44612 100644
--- a/ui/apps/platform/src/Containers/VulnMgmt/widgets/ClustersWithMostOrchestratorIstioVulnerabilities.js
+++ b/ui/apps/platform/src/Containers/VulnMgmt/widgets/ClustersWithMostClusterVulnerabilities.js
@@ -332,7 +332,7 @@ const processDataLegacy = (data, workflowState, limit, showVmUpdates) => {
     return results.slice(0, 8); // @TODO: Remove and add pagination when available
 };
 
-const ClustersWithMostOrchestratorVulnerabilities = ({ entityContext, limit }) => {
+const ClustersWithMostClusterVulnerabilities = ({ entityContext, limit }) => {
     const { isFeatureFlagEnabled } = useFeatureFlags();
     const showVmUpdates = isFeatureFlagEnabled('ROX_FRONTEND_VM_UPDATES');
     const queryToUse = showVmUpdates
@@ -399,14 +399,14 @@ const ClustersWithMostOrchestratorVulnerabilities = ({ entityContext, limit }) =
     );
 };
 
-ClustersWithMostOrchestratorVulnerabilities.propTypes = {
+ClustersWithMostClusterVulnerabilities.propTypes = {
     entityContext: PropTypes.shape({}),
     limit: PropTypes.number,
 };
 
-ClustersWithMostOrchestratorVulnerabilities.defaultProps = {
+ClustersWithMostClusterVulnerabilities.defaultProps = {
     entityContext: {},
     limit: 8,
 };
 
-export default ClustersWithMostOrchestratorVulnerabilities;
+export default ClustersWithMostClusterVulnerabilities;