Skip to content

ROX-12510: Optimize VM widget queries #3021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vjwilson merged 2 commits into from
Sep 9, 2022
Merged

ROX-12510: Optimize VM widget queries #3021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eef4864
Remove duplicate query field names for Most Common Vulns
vjwilson Sep 8, 2022
3e7974e
Remove duplicate fields in cluster VM widget queries
vjwilson Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ui/apps/platform/src/Containers/VulnMgmt/Dashboard/VulnMgmtDashboardPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -136,7 +136,7 @@ const VulnDashboardPage = ({ history }) => {
<DeploymentsWithMostSeverePolicyViolations limit={DASHBOARD_LIMIT} />
</div>
<div className="s-2 xxxl:sx-2">
<ClustersWithMostOrchestratorIstioVulnerabilities />
<ClustersWithMostClusterVulnerabilities />
</div>
</DashboardLayout>
);
Expand Down
8 changes: 4 additions & 4 deletions ...thMostOrchestratorIstioVulnerabilities.js → ...ClustersWithMostClusterVulnerabilities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
1 change: 0 additions & 1 deletion ui/apps/platform/src/Containers/VulnMgmt/widgets/MostCommonVulnerabilities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ const MOST_COMMON_IMAGE_VULNERABILITIES = gql`
scoreVersion
isFixable
deploymentCount
imageCount
summary
imageCount
lastScanned
Expand Down
1 change: 0 additions & 1 deletion ui/apps/platform/src/Containers/VulnMgmt/widgets/MostCommonVulnerabiltiesInDeployment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ const MOST_COMMON_IMAGE_VULNERABILITIES = gql`
scoreVersion
isFixable
deploymentCount
imageCount
Copy link
Copy Markdown
Contributor

@md2119 md2119 Sep 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

count 1...count 2 ...count 3 ... 💥

summary
imageCount
lastScanned
Expand Down