Commit 98fe8d87 authored by Dheeraj Joshi's avatar Dheeraj Joshi Committed by Kushal Pandya

Skip summary endpoint for certain security dashboard

The Group and Instance Security Dashboards hit the vulnerability
summary endpoint, even though they're not using the data from it
parent 27ab3866
...@@ -14,7 +14,6 @@ if (gon.features && gon.features.securityDashboard) { ...@@ -14,7 +14,6 @@ if (gon.features && gon.features.securityDashboard) {
emptyDashboardStateSvgPath, emptyDashboardStateSvgPath,
projectAddEndpoint, projectAddEndpoint,
projectListEndpoint, projectListEndpoint,
vulnerabilitiesCountEndpoint,
vulnerabilitiesEndpoint, vulnerabilitiesEndpoint,
vulnerabilitiesHistoryEndpoint, vulnerabilitiesHistoryEndpoint,
vulnerabilityFeedbackHelpPath, vulnerabilityFeedbackHelpPath,
...@@ -37,7 +36,6 @@ if (gon.features && gon.features.securityDashboard) { ...@@ -37,7 +36,6 @@ if (gon.features && gon.features.securityDashboard) {
emptyDashboardStateSvgPath, emptyDashboardStateSvgPath,
projectAddEndpoint, projectAddEndpoint,
projectListEndpoint, projectListEndpoint,
vulnerabilitiesCountEndpoint,
vulnerabilitiesEndpoint, vulnerabilitiesEndpoint,
vulnerabilitiesHistoryEndpoint, vulnerabilitiesHistoryEndpoint,
vulnerabilityFeedbackHelpPath, vulnerabilityFeedbackHelpPath,
......
...@@ -26,10 +26,6 @@ export default { ...@@ -26,10 +26,6 @@ export default {
type: String, type: String,
required: true, required: true,
}, },
vulnerabilitiesCountEndpoint: {
type: String,
required: true,
},
vulnerabilitiesHistoryEndpoint: { vulnerabilitiesHistoryEndpoint: {
type: String, type: String,
required: true, required: true,
...@@ -56,7 +52,6 @@ export default { ...@@ -56,7 +52,6 @@ export default {
<template> <template>
<security-dashboard <security-dashboard
:vulnerabilities-endpoint="vulnerabilitiesEndpoint" :vulnerabilities-endpoint="vulnerabilitiesEndpoint"
:vulnerabilities-count-endpoint="vulnerabilitiesCountEndpoint"
:vulnerabilities-history-endpoint="vulnerabilitiesHistoryEndpoint" :vulnerabilities-history-endpoint="vulnerabilitiesHistoryEndpoint"
:vulnerability-feedback-help-path="vulnerabilityFeedbackHelpPath" :vulnerability-feedback-help-path="vulnerabilityFeedbackHelpPath"
:vulnerable-projects-endpoint="vulnerableProjectsEndpoint" :vulnerable-projects-endpoint="vulnerableProjectsEndpoint"
......
...@@ -40,10 +40,6 @@ export default { ...@@ -40,10 +40,6 @@ export default {
type: String, type: String,
required: true, required: true,
}, },
vulnerabilitiesCountEndpoint: {
type: String,
required: true,
},
vulnerabilitiesHistoryEndpoint: { vulnerabilitiesHistoryEndpoint: {
type: String, type: String,
required: true, required: true,
...@@ -140,7 +136,6 @@ export default { ...@@ -140,7 +136,6 @@ export default {
<security-dashboard <security-dashboard
v-else v-else
:vulnerabilities-endpoint="vulnerabilitiesEndpoint" :vulnerabilities-endpoint="vulnerabilitiesEndpoint"
:vulnerabilities-count-endpoint="vulnerabilitiesCountEndpoint"
:vulnerabilities-history-endpoint="vulnerabilitiesHistoryEndpoint" :vulnerabilities-history-endpoint="vulnerabilitiesHistoryEndpoint"
:vulnerability-feedback-help-path="vulnerabilityFeedbackHelpPath" :vulnerability-feedback-help-path="vulnerabilityFeedbackHelpPath"
/> />
......
...@@ -42,7 +42,6 @@ export default function(dashboardType) { ...@@ -42,7 +42,6 @@ export default function(dashboardType) {
projectsEndpoint: el.dataset.projectsEndpoint, projectsEndpoint: el.dataset.projectsEndpoint,
vulnerabilityFeedbackHelpPath: el.dataset.vulnerabilityFeedbackHelpPath, vulnerabilityFeedbackHelpPath: el.dataset.vulnerabilityFeedbackHelpPath,
vulnerabilitiesEndpoint: el.dataset.vulnerabilitiesEndpoint, vulnerabilitiesEndpoint: el.dataset.vulnerabilitiesEndpoint,
vulnerabilitiesCountEndpoint: el.dataset.vulnerabilitiesSummaryEndpoint,
vulnerabilitiesHistoryEndpoint: el.dataset.vulnerabilitiesHistoryEndpoint, vulnerabilitiesHistoryEndpoint: el.dataset.vulnerabilitiesHistoryEndpoint,
vulnerableProjectsEndpoint: el.dataset.vulnerableProjectsEndpoint, vulnerableProjectsEndpoint: el.dataset.vulnerableProjectsEndpoint,
}, },
......
...@@ -8,7 +8,6 @@ module SecurityHelper ...@@ -8,7 +8,6 @@ module SecurityHelper
empty_state_svg_path: image_path('illustrations/operations-dashboard_empty.svg'), empty_state_svg_path: image_path('illustrations/operations-dashboard_empty.svg'),
project_add_endpoint: security_projects_path, project_add_endpoint: security_projects_path,
project_list_endpoint: security_projects_path, project_list_endpoint: security_projects_path,
vulnerabilities_count_endpoint: summary_security_vulnerability_findings_path,
vulnerabilities_endpoint: security_vulnerability_findings_path, vulnerabilities_endpoint: security_vulnerability_findings_path,
vulnerabilities_history_endpoint: history_security_vulnerability_findings_path, vulnerabilities_history_endpoint: history_security_vulnerability_findings_path,
vulnerability_feedback_help_path: help_page_path('user/application_security/index', anchor: 'interacting-with-the-vulnerabilities') vulnerability_feedback_help_path: help_page_path('user/application_security/index', anchor: 'interacting-with-the-vulnerabilities')
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
- page_title _("Security Dashboard") - page_title _("Security Dashboard")
#js-group-security-dashboard{ data: { vulnerabilities_endpoint: group_security_vulnerability_findings_path(@group), #js-group-security-dashboard{ data: { vulnerabilities_endpoint: group_security_vulnerability_findings_path(@group),
vulnerabilities_summary_endpoint: summary_group_security_vulnerability_findings_path(@group),
vulnerabilities_history_endpoint: history_group_security_vulnerability_findings_path(@group), vulnerabilities_history_endpoint: history_group_security_vulnerability_findings_path(@group),
projects_endpoint: expose_url(api_v4_groups_projects_path(id: @group.id)), projects_endpoint: expose_url(api_v4_groups_projects_path(id: @group.id)),
vulnerability_feedback_help_path: help_page_path("user/application_security/index", anchor: "interacting-with-the-vulnerabilities"), vulnerability_feedback_help_path: help_page_path("user/application_security/index", anchor: "interacting-with-the-vulnerabilities"),
......
...@@ -11,7 +11,6 @@ const dashboardDocumentation = '/help/docs'; ...@@ -11,7 +11,6 @@ const dashboardDocumentation = '/help/docs';
const emptyStateSvgPath = '/svgs/empty/svg'; const emptyStateSvgPath = '/svgs/empty/svg';
const projectsEndpoint = '/projects'; const projectsEndpoint = '/projects';
const vulnerabilitiesEndpoint = '/vulnerabilities'; const vulnerabilitiesEndpoint = '/vulnerabilities';
const vulnerabilitiesCountEndpoint = '/vulnerabilities_summary';
const vulnerabilitiesHistoryEndpoint = '/vulnerabilities_history'; const vulnerabilitiesHistoryEndpoint = '/vulnerabilities_history';
const vulnerabilityFeedbackHelpPath = '/vulnerabilities_feedback_help'; const vulnerabilityFeedbackHelpPath = '/vulnerabilities_feedback_help';
const vulnerableProjectsEndpoint = '/vulnerable_projects'; const vulnerableProjectsEndpoint = '/vulnerable_projects';
...@@ -42,7 +41,6 @@ describe('Group Security Dashboard component', () => { ...@@ -42,7 +41,6 @@ describe('Group Security Dashboard component', () => {
emptyStateSvgPath, emptyStateSvgPath,
projectsEndpoint, projectsEndpoint,
vulnerabilitiesEndpoint, vulnerabilitiesEndpoint,
vulnerabilitiesCountEndpoint,
vulnerabilitiesHistoryEndpoint, vulnerabilitiesHistoryEndpoint,
vulnerabilityFeedbackHelpPath, vulnerabilityFeedbackHelpPath,
vulnerableProjectsEndpoint, vulnerableProjectsEndpoint,
...@@ -73,7 +71,6 @@ describe('Group Security Dashboard component', () => { ...@@ -73,7 +71,6 @@ describe('Group Security Dashboard component', () => {
expect(dashboard.props()).toEqual( expect(dashboard.props()).toEqual(
expect.objectContaining({ expect.objectContaining({
vulnerabilitiesEndpoint, vulnerabilitiesEndpoint,
vulnerabilitiesCountEndpoint,
vulnerabilitiesHistoryEndpoint, vulnerabilitiesHistoryEndpoint,
vulnerabilityFeedbackHelpPath, vulnerabilityFeedbackHelpPath,
vulnerableProjectsEndpoint, vulnerableProjectsEndpoint,
......
...@@ -14,7 +14,6 @@ const emptyDashboardStateSvgPath = '/svgs/empty-dash.svg'; ...@@ -14,7 +14,6 @@ const emptyDashboardStateSvgPath = '/svgs/empty-dash.svg';
const projectAddEndpoint = '/projects/add'; const projectAddEndpoint = '/projects/add';
const projectListEndpoint = '/projects/list'; const projectListEndpoint = '/projects/list';
const vulnerabilitiesEndpoint = '/vulnerabilities'; const vulnerabilitiesEndpoint = '/vulnerabilities';
const vulnerabilitiesCountEndpoint = '/vulnerabilities_summary';
const vulnerabilitiesHistoryEndpoint = '/vulnerabilities_history'; const vulnerabilitiesHistoryEndpoint = '/vulnerabilities_history';
const vulnerabilityFeedbackHelpPath = '/vulnerabilities_feedback_help'; const vulnerabilityFeedbackHelpPath = '/vulnerabilities_feedback_help';
...@@ -57,7 +56,6 @@ describe('Instance Security Dashboard component', () => { ...@@ -57,7 +56,6 @@ describe('Instance Security Dashboard component', () => {
projectAddEndpoint, projectAddEndpoint,
projectListEndpoint, projectListEndpoint,
vulnerabilitiesEndpoint, vulnerabilitiesEndpoint,
vulnerabilitiesCountEndpoint,
vulnerabilitiesHistoryEndpoint, vulnerabilitiesHistoryEndpoint,
vulnerabilityFeedbackHelpPath, vulnerabilityFeedbackHelpPath,
}, },
...@@ -161,7 +159,6 @@ describe('Instance Security Dashboard component', () => { ...@@ -161,7 +159,6 @@ describe('Instance Security Dashboard component', () => {
expectComponentWithProps(SecurityDashboard, { expectComponentWithProps(SecurityDashboard, {
vulnerabilitiesEndpoint, vulnerabilitiesEndpoint,
vulnerabilitiesCountEndpoint,
vulnerabilitiesHistoryEndpoint, vulnerabilitiesHistoryEndpoint,
vulnerabilityFeedbackHelpPath, vulnerabilityFeedbackHelpPath,
}); });
......
...@@ -17,7 +17,6 @@ describe SecurityHelper do ...@@ -17,7 +17,6 @@ describe SecurityHelper do
empty_state_svg_path: image_path('illustrations/operations-dashboard_empty.svg'), empty_state_svg_path: image_path('illustrations/operations-dashboard_empty.svg'),
project_add_endpoint: security_projects_path, project_add_endpoint: security_projects_path,
project_list_endpoint: security_projects_path, project_list_endpoint: security_projects_path,
vulnerabilities_count_endpoint: summary_security_vulnerability_findings_path,
vulnerabilities_endpoint: security_vulnerability_findings_path, vulnerabilities_endpoint: security_vulnerability_findings_path,
vulnerabilities_history_endpoint: history_security_vulnerability_findings_path, vulnerabilities_history_endpoint: history_security_vulnerability_findings_path,
vulnerability_feedback_help_path: help_page_path('user/application_security/index', anchor: 'interacting-with-the-vulnerabilities') vulnerability_feedback_help_path: help_page_path('user/application_security/index', anchor: 'interacting-with-the-vulnerabilities')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment