Merge branch 'move-vulnerability-list-code' into 'master'

Move vulnerability_list and project_vuln_app

See merge request gitlab-org/gitlab!36637

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

 <script>
 import { s__ } from '~/locale';
 import { GlAlert, GlButton, GlEmptyState, GlIntersectionObserver } from '@gitlab/ui';
-import VulnerabilityList from 'ee/vulnerabilities/components/vulnerability_list.vue';
+import VulnerabilityList from './vulnerability_list.vue';
 import vulnerabilitiesQuery from '../graphql/group_vulnerabilities.graphql';
-import { VULNERABILITIES_PER_PAGE } from 'ee/vulnerabilities/constants';
+import { VULNERABILITIES_PER_PAGE } from '../store/constants';
 
 export default {
   components: {

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

@@ -2,9 +2,9 @@
 import { GlAlert, GlButton, GlEmptyState, GlIntersectionObserver, GlLoadingIcon } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import { fetchPolicies } from '~/lib/graphql';
-import VulnerabilityList from 'ee/vulnerabilities/components/vulnerability_list.vue';
+import VulnerabilityList from './vulnerability_list.vue';
 import vulnerabilitiesQuery from '../graphql/instance_vulnerabilities.graphql';
-import { VULNERABILITIES_PER_PAGE } from 'ee/vulnerabilities/constants';
+import { VULNERABILITIES_PER_PAGE } from '../store/constants';
 
 export default {
   components: {

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

@@ -3,11 +3,11 @@ import { GlBanner } from '@gitlab/ui';
 import Cookies from 'js-cookie';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import axios from '~/lib/utils/axios_utils';
-import ProjectVulnerabilitiesApp from 'ee/vulnerabilities/components/project_vulnerabilities_app.vue';
-import ReportsNotConfigured from 'ee/security_dashboard/components/empty_states/reports_not_configured.vue';
-import SecurityDashboardLayout from 'ee/security_dashboard/components/security_dashboard_layout.vue';
-import VulnerabilitiesCountList from 'ee/security_dashboard/components/vulnerability_count_list.vue';
-import Filters from 'ee/security_dashboard/components/first_class_vulnerability_filters.vue';
+import ProjectVulnerabilitiesApp from './project_vulnerabilities.vue';
+import ReportsNotConfigured from './empty_states/reports_not_configured.vue';
+import SecurityDashboardLayout from './security_dashboard_layout.vue';
+import VulnerabilitiesCountList from './vulnerability_count_list.vue';
+import Filters from './first_class_vulnerability_filters.vue';
 import CsvExportButton from './csv_export_button.vue';
 
 export const BANNER_COOKIE_KEY = 'hide_vulnerabilities_introduction_banner';

ee/app/assets/javascripts/vulnerabilities/components/project_vulnerabilities_app.vue → ee/app/assets/javascripts/security_dashboard/components/project_vulnerabilities.vue

 <script>
 import { s__ } from '~/locale';
 import { GlAlert, GlDeprecatedButton, GlEmptyState, GlIntersectionObserver } from '@gitlab/ui';
-import VulnerabilityList from 'ee/vulnerabilities/components/vulnerability_list.vue';
+import VulnerabilityList from './vulnerability_list.vue';
 import vulnerabilitiesQuery from '../graphql/project_vulnerabilities.graphql';
-import { VULNERABILITIES_PER_PAGE } from '../constants';
+import { VULNERABILITIES_PER_PAGE } from '../store/constants';
 
 export default {
   name: 'ProjectVulnerabilitiesApp',

ee/app/assets/javascripts/vulnerabilities/components/vulnerability_list.vue → ee/app/assets/javascripts/security_dashboard/components/vulnerability_list.vue

 <script>
 import { s__, __, sprintf } from '~/locale';
 import { GlEmptyState, GlFormCheckbox, GlLink, GlSkeletonLoading, GlTable } from '@gitlab/ui';
-import RemediatedBadge from './remediated_badge.vue';
+import RemediatedBadge from 'ee/vulnerabilities/components/remediated_badge.vue';
 import getPrimaryIdentifier from 'ee/vue_shared/security_reports/store/utils/get_primary_identifier';
 import SeverityBadge from 'ee/vue_shared/security_reports/components/severity_badge.vue';
-import SelectionSummary from 'ee/security_dashboard/components/selection_summary.vue';
-import IssueLink from './issue_link.vue';
-import VulnerabilityCommentIcon from 'ee/security_dashboard/components/vulnerability_comment_icon.vue';
-import { VULNERABILITIES_PER_PAGE } from '../constants';
+import SelectionSummary from './selection_summary.vue';
+import IssueLink from 'ee/vulnerabilities/components/issue_link.vue';
+import VulnerabilityCommentIcon from './vulnerability_comment_icon.vue';
+import { VULNERABILITIES_PER_PAGE } from '../store/constants';
 import convertReportType from 'ee/vue_shared/security_reports/store/utils/convert_report_type';
 
 export default {

ee/app/assets/javascripts/security_dashboard/graphql/group_vulnerabilities.graphql

 #import "~/graphql_shared/fragments/pageInfo.fragment.graphql"
-#import "ee/vulnerabilities/graphql/vulnerability.fragment.graphql"
+#import "./vulnerability.fragment.graphql"
 #import "./project.fragment.graphql"
 
 query group(

ee/app/assets/javascripts/security_dashboard/graphql/instance_vulnerabilities.graphql

 #import "~/graphql_shared/fragments/pageInfo.fragment.graphql"
-#import "ee/vulnerabilities/graphql/vulnerability.fragment.graphql"
+#import "./vulnerability.fragment.graphql"
 
 query instance(
   $after: String

ee/app/assets/javascripts/security_dashboard/store/constants.js

 import { s__ } from '~/locale';
 
+export const VULNERABILITIES_PER_PAGE = 20;
+
 export const SEVERITY_LEVELS = {
   critical: s__('severity|Critical'),
   high: s__('severity|High'),

ee/app/assets/javascripts/vulnerabilities/constants.js

@@ -31,8 +31,6 @@ export const VULNERABILITY_STATES = {
   resolved: s__('VulnerabilityStatusTypes|Resolved'),
 };
 
-export const VULNERABILITIES_PER_PAGE = 20;
-
 export const HEADER_ACTION_BUTTONS = {
   issueCreation: {
     name: s__('ciReport|Create issue'),

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

 import { shallowMount } from '@vue/test-utils';
 import { GlAlert, GlTable, GlEmptyState, GlIntersectionObserver } from '@gitlab/ui';
 import FirstClassGroupVulnerabilities from 'ee/security_dashboard/components/first_class_group_security_dashboard_vulnerabilities.vue';
-import VulnerabilityList from 'ee/vulnerabilities/components/vulnerability_list.vue';
-import { generateVulnerabilities } from '../../vulnerabilities/mock_data';
+import VulnerabilityList from 'ee/security_dashboard/components/vulnerability_list.vue';
+import { generateVulnerabilities } from './mock_data';
 
 describe('First Class Group Dashboard Vulnerabilities Component', () => {
   let wrapper;

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

@@ -2,8 +2,8 @@ import Vuex from 'vuex';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import { GlAlert, GlTable, GlEmptyState, GlIntersectionObserver } from '@gitlab/ui';
 import FirstClassInstanceVulnerabilities from 'ee/security_dashboard/components/first_class_instance_security_dashboard_vulnerabilities.vue';
-import VulnerabilityList from 'ee/vulnerabilities/components/vulnerability_list.vue';
-import { generateVulnerabilities } from '../../vulnerabilities/mock_data';
+import VulnerabilityList from 'ee/security_dashboard/components/vulnerability_list.vue';
+import { generateVulnerabilities } from './mock_data';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);

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

@@ -10,7 +10,7 @@ import FirstClassProjectSecurityDashboard, {
 } from 'ee/security_dashboard/components/first_class_project_security_dashboard.vue';
 import Filters from 'ee/security_dashboard/components/first_class_vulnerability_filters.vue';
 import SecurityDashboardLayout from 'ee/security_dashboard/components/security_dashboard_layout.vue';
-import ProjectVulnerabilitiesApp from 'ee/vulnerabilities/components/project_vulnerabilities_app.vue';
+import ProjectVulnerabilitiesApp from 'ee/security_dashboard/components/project_vulnerabilities.vue';
 import ReportsNotConfigured from 'ee/security_dashboard/components/empty_states/reports_not_configured.vue';
 import CsvExportButton from 'ee/security_dashboard/components/csv_export_button.vue';
 

ee/spec/frontend/vulnerabilities/project_vulnerabilities_app_spec.js → ee/spec/frontend/security_dashboard/components/project_vulnerabilities_app_spec.js

 import { GlAlert, GlIntersectionObserver } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import ProjectVulnerabilitiesApp from 'ee/vulnerabilities/components/project_vulnerabilities_app.vue';
-import VulnerabilityList from 'ee/vulnerabilities/components/vulnerability_list.vue';
+import ProjectVulnerabilitiesApp from 'ee/security_dashboard/components/project_vulnerabilities.vue';
+import VulnerabilityList from 'ee/security_dashboard/components/vulnerability_list.vue';
 import { generateVulnerabilities } from './mock_data';
 
 describe('Vulnerabilities app component', () => {

ee/spec/frontend/vulnerabilities/vulnerability_list_spec.js → ee/spec/frontend/security_dashboard/components/vulnerability_list_spec.js

@@ -3,7 +3,7 @@ import { GlEmptyState, GlSkeletonLoading } from '@gitlab/ui';
 import RemediatedBadge from 'ee/vulnerabilities/components/remediated_badge.vue';
 import SelectionSummary from 'ee/security_dashboard/components/selection_summary.vue';
 import VulnerabilityCommentIcon from 'ee/security_dashboard/components/vulnerability_comment_icon.vue';
-import VulnerabilityList from 'ee/vulnerabilities/components/vulnerability_list.vue';
+import VulnerabilityList from 'ee/security_dashboard/components/vulnerability_list.vue';
 import { generateVulnerabilities, vulnerabilities } from './mock_data';
 
 describe('Vulnerability list component', () => {

qa/qa/ee/page/project/secure/security_dashboard.rb

@@ -6,7 +6,7 @@ module QA
       module Project
         module Secure
           class SecurityDashboard < QA::Page::Base
-            view 'ee/app/assets/javascripts/vulnerabilities/components/vulnerability_list.vue' do
+            view 'ee/app/assets/javascripts/security_dashboard/components/vulnerability_list.vue' do
               element :vulnerability
             end