Merge branch...

Merge branch '197369-group-and-instance-security-dashboards-hit-the-vulnerabilities-summary-endpoint-without' into 'master'

Skip summary endpoint for Group and Instance Security Dashboard

See merge request gitlab-org/gitlab!23757

ee/app/assets/javascripts/pages/security/dashboard/show/index.js

@@ -14,7 +14,6 @@ if (gon.features && gon.features.securityDashboard) {
       emptyDashboardStateSvgPath,
       projectAddEndpoint,
       projectListEndpoint,
-      vulnerabilitiesCountEndpoint,
       vulnerabilitiesEndpoint,
       vulnerabilitiesHistoryEndpoint,
       vulnerabilityFeedbackHelpPath,
@@ -38,7 +37,6 @@ if (gon.features && gon.features.securityDashboard) {
             emptyDashboardStateSvgPath,
             projectAddEndpoint,
             projectListEndpoint,
-            vulnerabilitiesCountEndpoint,
             vulnerabilitiesEndpoint,
             vulnerabilitiesHistoryEndpoint,
             vulnerabilityFeedbackHelpPath,

ee/app/assets/javascripts/security_dashboard/components/group_security_dashboard.vue

@@ -26,10 +26,6 @@ export default {
       type: String,
       required: true,
     },
-    vulnerabilitiesCountEndpoint: {
-      type: String,
-      required: true,
-    },
     vulnerabilitiesHistoryEndpoint: {
       type: String,
       required: true,
@@ -56,7 +52,6 @@ export default {
 <template>
   <security-dashboard
     :vulnerabilities-endpoint="vulnerabilitiesEndpoint"
-    :vulnerabilities-count-endpoint="vulnerabilitiesCountEndpoint"
     :vulnerabilities-history-endpoint="vulnerabilitiesHistoryEndpoint"
     :vulnerability-feedback-help-path="vulnerabilityFeedbackHelpPath"
     :vulnerable-projects-endpoint="vulnerableProjectsEndpoint"

ee/app/assets/javascripts/security_dashboard/components/instance_security_dashboard.vue

@@ -40,10 +40,6 @@ export default {
       type: String,
       required: true,
     },
-    vulnerabilitiesCountEndpoint: {
-      type: String,
-      required: true,
-    },
     vulnerabilitiesHistoryEndpoint: {
       type: String,
       required: true,
@@ -145,7 +141,6 @@ export default {
         <security-dashboard
           v-else
           :vulnerabilities-endpoint="vulnerabilitiesEndpoint"
-          :vulnerabilities-count-endpoint="vulnerabilitiesCountEndpoint"
           :vulnerabilities-history-endpoint="vulnerabilitiesHistoryEndpoint"
           :vulnerability-feedback-help-path="vulnerabilityFeedbackHelpPath"
           :vulnerable-projects-endpoint="vulnerableProjectsEndpoint"

ee/app/assets/javascripts/security_dashboard/index.js

@@ -42,7 +42,6 @@ export default function(dashboardType) {
           projectsEndpoint: el.dataset.projectsEndpoint,
           vulnerabilityFeedbackHelpPath: el.dataset.vulnerabilityFeedbackHelpPath,
           vulnerabilitiesEndpoint: el.dataset.vulnerabilitiesEndpoint,
-          vulnerabilitiesCountEndpoint: el.dataset.vulnerabilitiesSummaryEndpoint,
           vulnerabilitiesHistoryEndpoint: el.dataset.vulnerabilitiesHistoryEndpoint,
           vulnerableProjectsEndpoint: el.dataset.vulnerableProjectsEndpoint,
         },

ee/app/helpers/security_helper.rb

@@ -8,7 +8,6 @@ module SecurityHelper
       empty_state_svg_path: image_path('illustrations/operations-dashboard_empty.svg'),
       project_add_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_history_endpoint: history_security_vulnerability_findings_path,
       vulnerability_feedback_help_path: help_page_path('user/application_security/index', anchor: 'interacting-with-the-vulnerabilities')

ee/app/views/groups/security/dashboard/show.html.haml

@@ -2,7 +2,6 @@
 - page_title _("Security Dashboard")
 
 #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),
   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"),

ee/spec/frontend/security_dashboard/components/group_security_dashboard_spec.js

@@ -11,7 +11,6 @@ const dashboardDocumentation = '/help/docs';
 const emptyStateSvgPath = '/svgs/empty/svg';
 const projectsEndpoint = '/projects';
 const vulnerabilitiesEndpoint = '/vulnerabilities';
-const vulnerabilitiesCountEndpoint = '/vulnerabilities_summary';
 const vulnerabilitiesHistoryEndpoint = '/vulnerabilities_history';
 const vulnerabilityFeedbackHelpPath = '/vulnerabilities_feedback_help';
 const vulnerableProjectsEndpoint = '/vulnerable_projects';
@@ -42,7 +41,6 @@ describe('Group Security Dashboard component', () => {
         emptyStateSvgPath,
         projectsEndpoint,
         vulnerabilitiesEndpoint,
-        vulnerabilitiesCountEndpoint,
         vulnerabilitiesHistoryEndpoint,
         vulnerabilityFeedbackHelpPath,
         vulnerableProjectsEndpoint,
@@ -73,7 +71,6 @@ describe('Group Security Dashboard component', () => {
       expect(dashboard.props()).toEqual(
         expect.objectContaining({
           vulnerabilitiesEndpoint,
-          vulnerabilitiesCountEndpoint,
           vulnerabilitiesHistoryEndpoint,
           vulnerabilityFeedbackHelpPath,
           vulnerableProjectsEndpoint,

ee/spec/frontend/security_dashboard/components/instance_security_dashboard_spec.js

@@ -14,7 +14,6 @@ const emptyDashboardStateSvgPath = '/svgs/empty-dash.svg';
 const projectAddEndpoint = '/projects/add';
 const projectListEndpoint = '/projects/list';
 const vulnerabilitiesEndpoint = '/vulnerabilities';
-const vulnerabilitiesCountEndpoint = '/vulnerabilities_summary';
 const vulnerabilitiesHistoryEndpoint = '/vulnerabilities_history';
 const vulnerabilityFeedbackHelpPath = '/vulnerabilities_feedback_help';
 const vulnerableProjectsEndpoint = '/vulnerable_projects_endpoint';
@@ -58,7 +57,6 @@ describe('Instance Security Dashboard component', () => {
         projectAddEndpoint,
         projectListEndpoint,
         vulnerabilitiesEndpoint,
-        vulnerabilitiesCountEndpoint,
         vulnerabilitiesHistoryEndpoint,
         vulnerabilityFeedbackHelpPath,
         vulnerableProjectsEndpoint,
@@ -163,7 +161,6 @@ describe('Instance Security Dashboard component', () => {
 
       expectComponentWithProps(SecurityDashboard, {
         vulnerabilitiesEndpoint,
-        vulnerabilitiesCountEndpoint,
         vulnerabilitiesHistoryEndpoint,
         vulnerabilityFeedbackHelpPath,
         vulnerableProjectsEndpoint,

ee/spec/helpers/security_helper_spec.rb

@@ -17,7 +17,6 @@ describe SecurityHelper do
         empty_state_svg_path: image_path('illustrations/operations-dashboard_empty.svg'),
         project_add_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_history_endpoint: history_security_vulnerability_findings_path,
         vulnerability_feedback_help_path: help_page_path('user/application_security/index', anchor: 'interacting-with-the-vulnerabilities')