Move remaining shared files to the shared subfolder

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

@@ -6,7 +6,7 @@ import vulnerabilityHistoryQuery from 'ee/security_dashboard/graphql/queries/gro
 import { PROJECT_LOADING_ERROR_MESSAGE } from 'ee/security_dashboard/helpers';
 import createFlash from '~/flash';
 import DashboardNotConfigured from '../empty_states/group_dashboard_not_configured.vue';
-import VulnerabilitySeverities from '../first_class_vulnerability_severities.vue';
+import VulnerabilitySeverities from '../shared/project_security_status_chart.vue';
 import SecurityDashboardLayout from '../shared/security_dashboard_layout.vue';
 import VulnerabilitiesOverTimeChart from '../shared/vulnerabilities_over_time_chart.vue';
 

ee/app/assets/javascripts/security_dashboard/components/group/group_vulnerabilities.vue

@@ -4,7 +4,7 @@ import produce from 'immer';
 import vulnerabilitiesQuery from 'ee/security_dashboard/graphql/queries/group_vulnerabilities.query.graphql';
 import { preparePageInfo } from 'ee/security_dashboard/helpers';
 import { VULNERABILITIES_PER_PAGE } from 'ee/security_dashboard/store/constants';
-import VulnerabilityList from '../vulnerability_list.vue';
+import VulnerabilityList from '../shared/vulnerability_list.vue';
 
 export default {
   components: {

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

@@ -6,7 +6,7 @@ import vulnerabilityHistoryQuery from 'ee/security_dashboard/graphql/queries/ins
 import { PROJECT_LOADING_ERROR_MESSAGE } from 'ee/security_dashboard/helpers';
 import createFlash from '~/flash';
 import DashboardNotConfigured from '../empty_states/instance_dashboard_not_configured.vue';
-import VulnerabilitySeverities from '../first_class_vulnerability_severities.vue';
+import VulnerabilitySeverities from '../shared/project_security_status_chart.vue';
 import SecurityDashboardLayout from '../shared/security_dashboard_layout.vue';
 import VulnerabilitiesOverTimeChart from '../shared/vulnerabilities_over_time_chart.vue';
 

ee/app/assets/javascripts/security_dashboard/components/instance/instance_vulnerabilities.vue

@@ -5,7 +5,7 @@ import vulnerabilitiesQuery from 'ee/security_dashboard/graphql/queries/instance
 import { preparePageInfo } from 'ee/security_dashboard/helpers';
 import { VULNERABILITIES_PER_PAGE } from 'ee/security_dashboard/store/constants';
 import { fetchPolicies } from '~/lib/graphql';
-import VulnerabilityList from '../vulnerability_list.vue';
+import VulnerabilityList from '../shared/vulnerability_list.vue';
 
 export default {
   components: {

ee/app/assets/javascripts/security_dashboard/components/instance/project_manager.vue

@@ -5,7 +5,7 @@ import addProjectToSecurityDashboard from 'ee/security_dashboard/graphql/mutatio
 import deleteProjectFromSecurityDashboard from 'ee/security_dashboard/graphql/mutations/delete_project_from_security_dashboard.mutation.graphql';
 import getProjects from 'ee/security_dashboard/graphql/queries/get_projects.query.graphql';
 import instanceProjectsQuery from 'ee/security_dashboard/graphql/queries/instance_projects.query.graphql';
-import { createInvalidProjectMessage } from 'ee/security_dashboard/utils/first_class_project_manager_utils';
+import { createInvalidProjectMessage } from 'ee/security_dashboard/utils/project_manager_utils';
 import createFlash from '~/flash';
 import { __, s__, sprintf } from '~/locale';
 import ProjectSelector from '~/vue_shared/components/project_selector/project_selector.vue';

ee/app/assets/javascripts/security_dashboard/components/pipeline/filters.vue

@@ -4,7 +4,7 @@ import { mapState, mapActions } from 'vuex';
 import { severityFilter, pipelineScannerFilter } from 'ee/security_dashboard/helpers';
 import { DISMISSAL_STATES } from 'ee/security_dashboard/store/modules/filters/constants';
 import { s__ } from '~/locale';
-import StandardFilter from '../filters/standard_filter.vue';
+import StandardFilter from '../shared/filters/standard_filter.vue';
 
 export default {
   i18n: {

ee/app/assets/javascripts/security_dashboard/components/pipeline/pipeline_findings.vue

@@ -4,7 +4,7 @@ import { produce } from 'immer';
 import findingsQuery from 'ee/security_dashboard/graphql/queries/pipeline_findings.query.graphql';
 import { preparePageInfo } from 'ee/security_dashboard/helpers';
 import { VULNERABILITIES_PER_PAGE } from 'ee/security_dashboard/store/constants';
-import VulnerabilityList from '../vulnerability_list.vue';
+import VulnerabilityList from '../shared/vulnerability_list.vue';
 
 export default {
   name: 'PipelineFindings',

ee/app/assets/javascripts/security_dashboard/components/pipeline/pipeline_security_dashboard.vue

@@ -5,7 +5,7 @@ import pipelineSecurityReportSummaryQuery from 'ee/security_dashboard/graphql/qu
 import { fetchPolicies } from '~/lib/graphql';
 import { s__ } from '~/locale';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import VulnerabilityReport from '../vulnerability_report.vue';
+import VulnerabilityReport from '../shared/vulnerability_report.vue';
 import ScanErrorsAlert from './scan_errors_alert.vue';
 import SecurityDashboard from './security_dashboard_vuex.vue';
 import SecurityReportsSummary from './security_reports_summary.vue';

ee/app/assets/javascripts/security_dashboard/components/pipeline/security_dashboard_vuex.vue

@@ -4,7 +4,7 @@ import PipelineArtifactDownload from 'ee/vue_shared/security_reports/components/
 import IssueModal from 'ee/vue_shared/security_reports/components/modal.vue';
 import { securityReportTypeEnumToReportType } from 'ee/vue_shared/security_reports/constants';
 import { vulnerabilityModalMixin } from 'ee/vue_shared/security_reports/mixins/vulnerability_modal_mixin';
-import VulnerabilityReportLayout from '../vulnerability_report_layout.vue';
+import VulnerabilityReportLayout from '../shared/vulnerability_report_layout.vue';
 import Filters from './filters.vue';
 import LoadingError from './loading_error.vue';
 import SecurityDashboardTable from './security_dashboard_table.vue';

ee/app/assets/javascripts/security_dashboard/components/project/project_vulnerabilities.vue

@@ -10,7 +10,7 @@ import { VULNERABILITIES_PER_PAGE } from 'ee/security_dashboard/store/constants'
 import { parseBoolean } from '~/lib/utils/common_utils';
 import { __ } from '~/locale';
 import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue';
-import VulnerabilityList from '../vulnerability_list.vue';
+import VulnerabilityList from '../shared/vulnerability_list.vue';
 import SecurityScannerAlert from './security_scanner_alert.vue';
 
 export default {

ee/app/assets/javascripts/security_dashboard/components/filters/activity_filter.vue → ee/app/assets/javascripts/security_dashboard/components/shared/filters/activity_filter.vue

 <script>
 import { GlDropdownDivider } from '@gitlab/ui';
 import { xor, remove } from 'lodash';
-import { activityOptions } from '../../helpers';
+import { activityOptions } from 'ee/security_dashboard/helpers';
 import FilterBody from './filter_body.vue';
 import FilterItem from './filter_item.vue';
 import StandardFilter from './standard_filter.vue';

ee/app/assets/javascripts/security_dashboard/components/first_class_vulnerability_filters.vue → ee/app/assets/javascripts/security_dashboard/components/shared/filters/filters_layout.vue

@@ -6,11 +6,11 @@ import {
   scannerFilter,
   activityFilter,
   getProjectFilter,
-} from '../helpers';
-import { DASHBOARD_TYPES } from '../store/constants';
-import ActivityFilter from './filters/activity_filter.vue';
-import ScannerFilter from './filters/scanner_filter.vue';
-import StandardFilter from './filters/standard_filter.vue';
+} from 'ee/security_dashboard/helpers';
+import { DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
+import ActivityFilter from './activity_filter.vue';
+import ScannerFilter from './scanner_filter.vue';
+import StandardFilter from './standard_filter.vue';
 
 export default {
   components: { StandardFilter, ScannerFilter, ActivityFilter },

ee/app/assets/javascripts/security_dashboard/components/filters/scanner_filter.vue → ee/app/assets/javascripts/security_dashboard/components/shared/filters/scanner_filter.vue

@@ -2,7 +2,7 @@
 import { GlDropdownDivider, GlDropdownItem, GlTruncate } from '@gitlab/ui';
 import { union, without, get, set, keyBy } from 'lodash';
 import { DEFAULT_SCANNER, SCANNER_ID_PREFIX } from 'ee/security_dashboard/constants';
-import { createScannerOption } from '../../helpers';
+import { createScannerOption } from 'ee/security_dashboard/helpers';
 import FilterBody from './filter_body.vue';
 import FilterItem from './filter_item.vue';
 import StandardFilter from './standard_filter.vue';

ee/app/assets/javascripts/security_dashboard/components/project_pipeline_status.vue → ee/app/assets/javascripts/security_dashboard/components/shared/project_pipeline_status.vue

 <script>
 import { GlLink } from '@gitlab/ui';
+import projectAutoFixMrsCountQuery from 'ee/security_dashboard/graphql/queries/project_auto_fix_mrs_count.query.graphql';
 import { __, s__ } from '~/locale';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import projectAutoFixMrsCountQuery from '../graphql/queries/project_auto_fix_mrs_count.query.graphql';
 import PipelineStatusBadge from './pipeline_status_badge.vue';
 
 export default {

ee/app/assets/javascripts/security_dashboard/components/selection_summary.vue → ee/app/assets/javascripts/security_dashboard/components/shared/selection_summary.vue

 <script>
 import { GlCollapse, GlButton, GlAlert } from '@gitlab/ui';
 import vulnerabilityStateMutations from 'ee/security_dashboard/graphql/mutate_vulnerability_state';
+import eventHub from 'ee/security_dashboard/utils/event_hub';
 import { __, s__, n__ } from '~/locale';
 import toast from '~/vue_shared/plugins/global_toast';
-import eventHub from '../utils/event_hub';
 import StatusDropdown from './status_dropdown.vue';
 
 export default {

ee/app/assets/javascripts/security_dashboard/components/shared/vulnerabilities_over_time_chart.vue

@@ -11,7 +11,7 @@ import {
 } from '~/lib/utils/datetime_utility';
 import { formattedChangeInPercent } from '~/lib/utils/number_utils';
 import { s__, sprintf } from '~/locale';
-import ChartButtons from '../vulnerability_chart_buttons.vue';
+import ChartButtons from './vulnerabilities_over_time_chart_buttons.vue';
 
 const ISO_DATE = 'isoDate';
 const TH_CLASS = 'gl-bg-white!';

ee/app/assets/javascripts/security_dashboard/components/vulnerability_count_list.vue → ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_count_list.vue

 <script>
-import vulnerabilitySeveritiesCountQuery from '../graphql/queries/vulnerability_severities_count.query.graphql';
-import { DASHBOARD_TYPES } from '../store/constants';
-import eventHub from '../utils/event_hub';
+import vulnerabilitySeveritiesCountQuery from 'ee/security_dashboard/graphql/queries/vulnerability_severities_count.query.graphql';
+import { DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
+import eventHub from 'ee/security_dashboard/utils/event_hub';
 import VulnerabilityCountListLayout from './vulnerability_count_list_layout.vue';
 
 export default {

ee/app/assets/javascripts/security_dashboard/components/vulnerability_count_list_layout.vue → ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_count_list_layout.vue

 <script>
 import { GlAlert } from '@gitlab/ui';
-import { SEVERITIES } from '../store/modules/vulnerabilities/constants';
+import { SEVERITIES } from 'ee/security_dashboard/store/modules/vulnerabilities/constants';
 import VulnerabilityCount from './vulnerability_count.vue';
 
 export default {

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

@@ -8,10 +8,9 @@ import {
   GlTooltipDirective,
   GlTable,
 } from '@gitlab/ui';
-import AutoFixHelpText from 'ee/security_dashboard/components/auto_fix_help_text.vue';
 import DashboardHasNoVulnerabilities from 'ee/security_dashboard/components/empty_states/dashboard_has_no_vulnerabilities.vue';
 import FiltersProducedNoResults from 'ee/security_dashboard/components/empty_states/filters_produced_no_results.vue';
-import VulnerabilityCommentIcon from 'ee/security_dashboard/components/vulnerability_comment_icon.vue';
+import { VULNERABILITIES_PER_PAGE, DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
 import SeverityBadge from 'ee/vue_shared/security_reports/components/severity_badge.vue';
 import convertReportType from 'ee/vue_shared/security_reports/store/utils/convert_report_type';
 import getPrimaryIdentifier from 'ee/vue_shared/security_reports/store/utils/get_primary_identifier';
@@ -20,9 +19,10 @@ import { VULNERABILITY_STATES } from 'ee/vulnerabilities/constants';
 import { formatDate } from '~/lib/utils/datetime_utility';
 import { convertToSnakeCase } from '~/lib/utils/text_utility';
 import { s__, __ } from '~/locale';
-import { VULNERABILITIES_PER_PAGE, DASHBOARD_TYPES } from '../store/constants';
+import AutoFixHelpText from './auto_fix_help_text.vue';
 import IssuesBadge from './issues_badge.vue';
 import SelectionSummary from './selection_summary.vue';
+import VulnerabilityCommentIcon from './vulnerability_comment_icon.vue';
 
 export default {
   components: {

ee/app/assets/javascripts/security_dashboard/components/vulnerability_report.vue → ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_report.vue

@@ -2,23 +2,23 @@
 import { GlLoadingIcon } from '@gitlab/ui';
 import Cookies from 'js-cookie';
 import { PortalTarget } from 'portal-vue';
-import Filters from 'ee/security_dashboard/components/first_class_vulnerability_filters.vue';
+import groupProjectsQuery from 'ee/security_dashboard/graphql/queries/group_projects.query.graphql';
+import instanceProjectsQuery from 'ee/security_dashboard/graphql/queries/instance_projects.query.graphql';
 import { DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
 import { s__ } from '~/locale';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import groupProjectsQuery from '../graphql/queries/group_projects.query.graphql';
-import instanceProjectsQuery from '../graphql/queries/instance_projects.query.graphql';
+import DashboardNotConfiguredGroup from '../empty_states/group_dashboard_not_configured.vue';
+import DashboardNotConfiguredInstance from '../empty_states/instance_dashboard_not_configured.vue';
+import DashboardNotConfiguredProject from '../empty_states/reports_not_configured.vue';
+import GroupVulnerabilities from '../group/group_vulnerabilities.vue';
+import InstanceVulnerabilities from '../instance/instance_vulnerabilities.vue';
+import PipelineFindings from '../pipeline/pipeline_findings.vue';
+import ProjectVulnerabilities from '../project/project_vulnerabilities.vue';
 import AutoFixUserCallout from './auto_fix_user_callout.vue';
 import CsvExportButton from './csv_export_button.vue';
-import DashboardNotConfiguredGroup from './empty_states/group_dashboard_not_configured.vue';
-import DashboardNotConfiguredInstance from './empty_states/instance_dashboard_not_configured.vue';
-import DashboardNotConfiguredProject from './empty_states/reports_not_configured.vue';
-import GroupVulnerabilities from './group/group_vulnerabilities.vue';
-import InstanceVulnerabilities from './instance/instance_vulnerabilities.vue';
-import PipelineFindings from './pipeline/pipeline_findings.vue';
-import ProjectVulnerabilities from './project/project_vulnerabilities.vue';
+import Filters from './filters/filters_layout.vue';
 import ProjectPipelineStatus from './project_pipeline_status.vue';
-import SurveyRequestBanner from './shared/survey_request_banner.vue';
+import SurveyRequestBanner from './survey_request_banner.vue';
 import VulnerabilitiesCountList from './vulnerability_count_list.vue';
 import VulnerabilityReportLayout from './vulnerability_report_layout.vue';
 

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

@@ -2,7 +2,7 @@ import Vue from 'vue';
 import { DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import UnavailableState from './components/empty_states/unavailable_state.vue';
-import VulnerabilityReport from './components/vulnerability_report.vue';
+import VulnerabilityReport from './components/shared/vulnerability_report.vue';
 import apolloProvider from './graphql/provider';
 import createRouter from './router';
 import createStore from './store';

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

 import { GlLoadingIcon } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import DashboardNotConfigured from 'ee/security_dashboard/components/empty_states/group_dashboard_not_configured.vue';
-import VulnerabilitySeverities from 'ee/security_dashboard/components/first_class_vulnerability_severities.vue';
 import GroupSecurityDashboard from 'ee/security_dashboard/components/group/group_security_dashboard.vue';
+import VulnerabilitySeverities from 'ee/security_dashboard/components/shared/project_security_status_chart.vue';
 import SecurityDashboardLayout from 'ee/security_dashboard/components/shared/security_dashboard_layout.vue';
 import VulnerabilitiesOverTimeChart from 'ee/security_dashboard/components/shared/vulnerabilities_over_time_chart.vue';
 import vulnerabilityGradesQuery from 'ee/security_dashboard/graphql/queries/group_vulnerability_grades.query.graphql';

ee/spec/frontend/security_dashboard/components/group/group_vulnerabilities_spec.js

@@ -2,7 +2,7 @@ import { GlAlert, GlIntersectionObserver, GlLoadingIcon } from '@gitlab/ui';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import VueApollo from 'vue-apollo';
 import GroupVulnerabilities from 'ee/security_dashboard/components/group/group_vulnerabilities.vue';
-import VulnerabilityList from 'ee/security_dashboard/components/vulnerability_list.vue';
+import VulnerabilityList from 'ee/security_dashboard/components/shared/vulnerability_list.vue';
 import vulnerabilitiesQuery from 'ee/security_dashboard/graphql/queries/group_vulnerabilities.query.graphql';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import { generateVulnerabilities } from '../mock_data';

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

 import { GlLoadingIcon } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import DashboardNotConfigured from 'ee/security_dashboard/components/empty_states/instance_dashboard_not_configured.vue';
-import VulnerabilitySeverities from 'ee/security_dashboard/components/first_class_vulnerability_severities.vue';
 import InstanceSecurityDashboard from 'ee/security_dashboard/components/instance/instance_security_dashboard.vue';
+import VulnerabilitySeverities from 'ee/security_dashboard/components/shared/project_security_status_chart.vue';
 import SecurityDashboardLayout from 'ee/security_dashboard/components/shared/security_dashboard_layout.vue';
 import VulnerabilitiesOverTimeChart from 'ee/security_dashboard/components/shared/vulnerabilities_over_time_chart.vue';
 import vulnerabilityGradesQuery from 'ee/security_dashboard/graphql/queries/instance_vulnerability_grades.query.graphql';

ee/spec/frontend/security_dashboard/components/instance/instance_vulnerabilities_spec.js

@@ -2,7 +2,7 @@ import { GlAlert, GlIntersectionObserver, GlLoadingIcon } from '@gitlab/ui';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
 import VueApollo from 'vue-apollo';
 import InstanceVulnerabilities from 'ee/security_dashboard/components/instance/instance_vulnerabilities.vue';
-import VulnerabilityList from 'ee/security_dashboard/components/vulnerability_list.vue';
+import VulnerabilityList from 'ee/security_dashboard/components/shared/vulnerability_list.vue';
 import vulnerabilitiesQuery from 'ee/security_dashboard/graphql/queries/instance_vulnerabilities.query.graphql';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import { generateVulnerabilities } from '../mock_data';

ee/spec/frontend/security_dashboard/components/pipeline/pipeline_findings_spec.js

@@ -2,7 +2,7 @@ import { GlAlert, GlIntersectionObserver, GlLoadingIcon } from '@gitlab/ui';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import VueApollo from 'vue-apollo';
 import PipelineFindings from 'ee/security_dashboard/components/pipeline/pipeline_findings.vue';
-import VulnerabilityList from 'ee/security_dashboard/components/vulnerability_list.vue';
+import VulnerabilityList from 'ee/security_dashboard/components/shared/vulnerability_list.vue';
 import pipelineFindingsQuery from 'ee/security_dashboard/graphql/queries/pipeline_findings.query.graphql';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import { mockPipelineFindingsResponse } from '../../mock_data';

ee/spec/frontend/security_dashboard/components/pipeline/pipeline_security_dashboard_spec.js

@@ -5,7 +5,7 @@ import PipelineSecurityDashboard from 'ee/security_dashboard/components/pipeline
 import ScanErrorsAlert from 'ee/security_dashboard/components/pipeline/scan_errors_alert.vue';
 import SecurityDashboard from 'ee/security_dashboard/components/pipeline/security_dashboard_vuex.vue';
 import SecurityReportsSummary from 'ee/security_dashboard/components/pipeline/security_reports_summary.vue';
-import VulnerabilityReport from 'ee/security_dashboard/components/vulnerability_report.vue';
+import VulnerabilityReport from 'ee/security_dashboard/components/shared/vulnerability_report.vue';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);

ee/spec/frontend/security_dashboard/components/pipeline/security_dashboard_vuex_spec.js

@@ -7,7 +7,7 @@ import Filters from 'ee/security_dashboard/components/pipeline/filters.vue';
 import LoadingError from 'ee/security_dashboard/components/pipeline/loading_error.vue';
 import SecurityDashboardTable from 'ee/security_dashboard/components/pipeline/security_dashboard_table.vue';
 import SecurityDashboard from 'ee/security_dashboard/components/pipeline/security_dashboard_vuex.vue';
-import VulnerabilityReportLayout from 'ee/security_dashboard/components/vulnerability_report_layout.vue';
+import VulnerabilityReportLayout from 'ee/security_dashboard/components/shared/vulnerability_report_layout.vue';
 import { getStoreConfig } from 'ee/security_dashboard/store';
 import { VULNERABILITY_MODAL_ID } from 'ee/vue_shared/security_reports/components/constants';
 import IssueModal from 'ee/vue_shared/security_reports/components/modal.vue';

ee/spec/frontend/security_dashboard/components/project/project_vulnerabilities_spec.js

@@ -4,7 +4,7 @@ import { Portal } from 'portal-vue';
 import VueApollo from 'vue-apollo';
 import ProjectVulnerabilities from 'ee/security_dashboard/components/project/project_vulnerabilities.vue';
 import SecurityScannerAlert from 'ee/security_dashboard/components/project/security_scanner_alert.vue';
-import VulnerabilityList from 'ee/security_dashboard/components/vulnerability_list.vue';
+import VulnerabilityList from 'ee/security_dashboard/components/shared/vulnerability_list.vue';
 import securityScannersQuery from 'ee/security_dashboard/graphql/queries/project_security_scanners.query.graphql';
 import vulnerabilitiesQuery from 'ee/security_dashboard/graphql/queries/project_vulnerabilities.query.graphql';
 import { useLocalStorageSpy } from 'helpers/local_storage_helper';

ee/spec/frontend/security_dashboard/components/auto_fix_help_text_spec.js → ee/spec/frontend/security_dashboard/components/shared/auto_fix_help_text_spec.js

 import { mount } from '@vue/test-utils';
-import AutoFixHelpText from 'ee/security_dashboard/components/auto_fix_help_text.vue';
+import AutoFixHelpText from 'ee/security_dashboard/components/shared/auto_fix_help_text.vue';
 
 const TEST_MERGE_REQUEST_DATA = {
   webUrl: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48820',

ee/spec/frontend/security_dashboard/components/auto_fix_user_callout_spec.js → ee/spec/frontend/security_dashboard/components/shared/auto_fix_user_callout_spec.js

 import { GlBanner } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import AutoFixUserCallout from 'ee/security_dashboard/components/auto_fix_user_callout.vue';
+import AutoFixUserCallout from 'ee/security_dashboard/components/shared/auto_fix_user_callout.vue';
 
 describe('AutoFixUserCallout', () => {
   let wrapper;

ee/spec/frontend/security_dashboard/components/csv_export_button_spec.js → ee/spec/frontend/security_dashboard/components/shared/csv_export_button_spec.js

@@ -3,7 +3,7 @@ import { shallowMount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
 import CsvExportButton, {
   STORAGE_KEY,
-} from 'ee/security_dashboard/components/csv_export_button.vue';
+} from 'ee/security_dashboard/components/shared/csv_export_button.vue';
 import { useLocalStorageSpy } from 'helpers/local_storage_helper';
 import { TEST_HOST } from 'helpers/test_constants';
 import createFlash from '~/flash';

ee/spec/frontend/security_dashboard/components/filters/activity_filter_spec.js → ee/spec/frontend/security_dashboard/components/shared/filters/activity_filter_spec.js

 import { shallowMount } from '@vue/test-utils';
-import ActivityFilter from 'ee/security_dashboard/components/filters/activity_filter.vue';
+import ActivityFilter from 'ee/security_dashboard/components/shared/filters/activity_filter.vue';
 import { activityFilter, activityOptions } from 'ee/security_dashboard/helpers';
 
 const { NO_ACTIVITY, WITH_ISSUES, NO_LONGER_DETECTED } = activityOptions;

ee/spec/frontend/security_dashboard/components/filters/filter_body_spec.js → ee/spec/frontend/security_dashboard/components/shared/filters/filter_body_spec.js

 import { GlDropdown, GlSearchBoxByType, GlLoadingIcon } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
-import FilterBody from 'ee/security_dashboard/components/filters/filter_body.vue';
+import FilterBody from 'ee/security_dashboard/components/shared/filters/filter_body.vue';
 
 describe('Filter Body component', () => {
   let wrapper;

ee/spec/frontend/security_dashboard/components/filters/filter_item_spec.js → ee/spec/frontend/security_dashboard/components/shared/filters/filter_item_spec.js

 import { GlDropdownItem, GlTruncate } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import FilterItem from 'ee/security_dashboard/components/filters/filter_item.vue';
+import FilterItem from 'ee/security_dashboard/components/shared/filters/filter_item.vue';
 
 describe('Filter Item component', () => {
   let wrapper;

ee/spec/frontend/security_dashboard/components/first_class_vulnerability_filters_spec.js → ee/spec/frontend/security_dashboard/components/shared/filters/filters_layout_spec.js

 import { shallowMount } from '@vue/test-utils';
-import ActivityFilter from 'ee/security_dashboard/components/filters/activity_filter.vue';
-import ScannerFilter from 'ee/security_dashboard/components/filters/scanner_filter.vue';
-import StandardFilter from 'ee/security_dashboard/components/filters/standard_filter.vue';
-import Filters from 'ee/security_dashboard/components/first_class_vulnerability_filters.vue';
+import ActivityFilter from 'ee/security_dashboard/components/shared/filters/activity_filter.vue';
+import Filters from 'ee/security_dashboard/components/shared/filters/filters_layout.vue';
+import ScannerFilter from 'ee/security_dashboard/components/shared/filters/scanner_filter.vue';
+import StandardFilter from 'ee/security_dashboard/components/shared/filters/standard_filter.vue';
 import { getProjectFilter } from 'ee/security_dashboard/helpers';
 import { DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';

ee/spec/frontend/security_dashboard/components/filters/scanner_filter_spec.js → ee/spec/frontend/security_dashboard/components/shared/filters/scanner_filter_spec.js

@@ -2,8 +2,8 @@ import { GlDropdownItem, GlDropdownDivider } from '@gitlab/ui';
 import { createLocalVue, shallowMount } from '@vue/test-utils';
 import { sampleSize, cloneDeep } from 'lodash';
 import VueRouter from 'vue-router';
-import FilterItem from 'ee/security_dashboard/components/filters/filter_item.vue';
-import ScannerFilter from 'ee/security_dashboard/components/filters/scanner_filter.vue';
+import FilterItem from 'ee/security_dashboard/components/shared/filters/filter_item.vue';
+import ScannerFilter from 'ee/security_dashboard/components/shared/filters/scanner_filter.vue';
 import { DEFAULT_SCANNER, SCANNER_ID_PREFIX } from 'ee/security_dashboard/constants';
 import { scannerFilter } from 'ee/security_dashboard/helpers';
 

ee/spec/frontend/security_dashboard/components/filters/standard_filter_spec.js → ee/spec/frontend/security_dashboard/components/shared/filters/standard_filter_spec.js

 import { createLocalVue, shallowMount } from '@vue/test-utils';
 import VueRouter from 'vue-router';
-import FilterBody from 'ee/security_dashboard/components/filters/filter_body.vue';
-import StandardFilter from 'ee/security_dashboard/components/filters/standard_filter.vue';
+import FilterBody from 'ee/security_dashboard/components/shared/filters/filter_body.vue';
+import StandardFilter from 'ee/security_dashboard/components/shared/filters/standard_filter.vue';
 
 const localVue = createLocalVue();
 localVue.use(VueRouter);

ee/spec/frontend/security_dashboard/components/issues_badge_spec.js → ee/spec/frontend/security_dashboard/components/shared/issues_badge_spec.js

 import { GlIcon, GlPopover, GlBadge } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import IssuesBadge from 'ee/security_dashboard/components/issues_badge.vue';
+import IssuesBadge from 'ee/security_dashboard/components/shared/issues_badge.vue';
 import IssueLink from 'ee/vulnerabilities/components/issue_link.vue';
 
 describe('Remediated badge component', () => {

ee/spec/frontend/security_dashboard/components/pipeline_status_badge_spec.js → ee/spec/frontend/security_dashboard/components/shared/pipeline_status_badge_spec.js

 import { GlBadge, GlIcon } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import { merge } from 'lodash';
-import PipelineStatusBadge from 'ee/security_dashboard/components/pipeline_status_badge.vue';
+import PipelineStatusBadge from 'ee/security_dashboard/components/shared/pipeline_status_badge.vue';
 
 describe('Pipeline status badge', () => {
   let wrapper;

ee/spec/frontend/security_dashboard/components/project_pipeline_status_spec.js → ee/spec/frontend/security_dashboard/components/shared/project_pipeline_status_spec.js

@@ -2,8 +2,8 @@ import { GlLink } from '@gitlab/ui';
 import { within } from '@testing-library/dom';
 import { shallowMount } from '@vue/test-utils';
 import { merge } from 'lodash';
-import PipelineStatusBadge from 'ee/security_dashboard/components/pipeline_status_badge.vue';
-import ProjectPipelineStatus from 'ee/security_dashboard/components/project_pipeline_status.vue';
+import PipelineStatusBadge from 'ee/security_dashboard/components/shared/pipeline_status_badge.vue';
+import ProjectPipelineStatus from 'ee/security_dashboard/components/shared/project_pipeline_status.vue';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 

ee/spec/frontend/security_dashboard/components/first_class_vulnerability_severities_spec.js → ee/spec/frontend/security_dashboard/components/shared/project_security_status_chart_spec.js

 import { GlLink, GlLoadingIcon } from '@gitlab/ui';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import VueApollo from 'vue-apollo';
-import VulnerabilitySeverity from 'ee/security_dashboard/components/first_class_vulnerability_severities.vue';
+import VulnerabilitySeverity from 'ee/security_dashboard/components/shared/project_security_status_chart.vue';
 import groupVulnerabilityGradesQuery from 'ee/security_dashboard/graphql/queries/group_vulnerability_grades.query.graphql';
 import instanceVulnerabilityGradesQuery from 'ee/security_dashboard/graphql/queries/instance_vulnerability_grades.query.graphql';
 import { severityGroupTypes } from 'ee/security_dashboard/store/modules/vulnerable_projects/constants';
@@ -13,7 +13,7 @@ import {
   mockProjectsWithSeverityCounts,
   mockInstanceVulnerabilityGrades,
   mockGroupVulnerabilityGrades,
-} from '../mock_data';
+} from '../../mock_data';
 
 const localVue = createLocalVue();
 localVue.use(VueApollo);

ee/spec/frontend/security_dashboard/components/selection_summary_spec.js → ee/spec/frontend/security_dashboard/components/shared/selection_summary_spec.js

 import { GlAlert } from '@gitlab/ui';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import VueApollo from 'vue-apollo';
-import SelectionSummary from 'ee/security_dashboard/components/selection_summary.vue';
-import StatusDropdown from 'ee/security_dashboard/components/status_dropdown.vue';
+import SelectionSummary from 'ee/security_dashboard/components/shared/selection_summary.vue';
+import StatusDropdown from 'ee/security_dashboard/components/shared/status_dropdown.vue';
 import vulnerabilityStateMutations from 'ee/security_dashboard/graphql/mutate_vulnerability_state';
 import eventHub from 'ee/security_dashboard/utils/event_hub';
 import createMockApollo from 'helpers/mock_apollo_helper';

ee/spec/frontend/security_dashboard/components/status_dropdown_spec.js → ee/spec/frontend/security_dashboard/components/shared/status_dropdown_spec.js

 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import StatusDropdown from 'ee/security_dashboard/components/status_dropdown.vue';
+import StatusDropdown from 'ee/security_dashboard/components/shared/status_dropdown.vue';
 import { VULNERABILITY_STATE_OBJECTS } from 'ee/vulnerabilities/constants';
 
 describe('Status Dropdown component', () => {

ee/spec/frontend/security_dashboard/components/vulnerability_chart_button_spec.js → ee/spec/frontend/security_dashboard/components/shared/vulnerabilities_over_time_chart_buttons_spec.js

 import { shallowMount, mount, createLocalVue } from '@vue/test-utils';
 import Vue from 'vue';
-import component from 'ee/security_dashboard/components/vulnerability_chart_buttons.vue';
+import component from 'ee/security_dashboard/components/shared/vulnerabilities_over_time_chart_buttons.vue';
 import { DAYS } from 'ee/security_dashboard/store/constants';
 
 const localVue = createLocalVue();

ee/spec/frontend/security_dashboard/components/shared/vulnerabilities_over_time_chart_spec.js

 import { GlLoadingIcon, GlTable } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import VulnerabilitiesOverTimeChart from 'ee/security_dashboard/components/shared/vulnerabilities_over_time_chart.vue';
-import ChartButtons from 'ee/security_dashboard/components/vulnerability_chart_buttons.vue';
+import ChartButtons from 'ee/security_dashboard/components/shared/vulnerabilities_over_time_chart_buttons.vue';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
 describe('Vulnerabilities Over Time Chart Component', () => {

ee/spec/frontend/security_dashboard/components/vulnerability_count_list_layout_spec.js → ee/spec/frontend/security_dashboard/components/shared/vulnerability_count_list_layout_spec.js

 import { GlAlert } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import VulnerabilityCount from 'ee/security_dashboard/components/vulnerability_count.vue';
-import VulnerabilityCountListLayout from 'ee/security_dashboard/components/vulnerability_count_list_layout.vue';
+import VulnerabilityCount from 'ee/security_dashboard/components/shared/vulnerability_count.vue';
+import VulnerabilityCountListLayout from 'ee/security_dashboard/components/shared/vulnerability_count_list_layout.vue';
 
 describe('Vulnerabilities count list component', () => {
   let wrapper;

ee/spec/frontend/security_dashboard/components/vulnerability_count_list_spec.js → ee/spec/frontend/security_dashboard/components/shared/vulnerability_count_list_spec.js

 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import VueApollo from 'vue-apollo';
-import VulnerabilityCountList from 'ee/security_dashboard/components/vulnerability_count_list.vue';
-import VulnerabilityCountListLayout from 'ee/security_dashboard/components/vulnerability_count_list_layout.vue';
+import VulnerabilityCountList from 'ee/security_dashboard/components/shared/vulnerability_count_list.vue';
+import VulnerabilityCountListLayout from 'ee/security_dashboard/components/shared/vulnerability_count_list_layout.vue';
 import countQuery from 'ee/security_dashboard/graphql/queries/vulnerability_severities_count.query.graphql';
 import { DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
 import eventHub from 'ee/security_dashboard/utils/event_hub';
 import createMockApollo from 'helpers/mock_apollo_helper';
-import { mockVulnerabilitySeveritiesGraphQLResponse } from '../mock_data';
+import { mockVulnerabilitySeveritiesGraphQLResponse } from '../../mock_data';
 
 const localVue = createLocalVue();
 localVue.use(VueApollo);

ee/spec/frontend/security_dashboard/components/vulnerability_count_spec.js → ee/spec/frontend/security_dashboard/components/shared/vulnerability_count_spec.js

 import { GlCard } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import VulnerabilityCount from 'ee/security_dashboard/components/vulnerability_count.vue';
+import VulnerabilityCount from 'ee/security_dashboard/components/shared/vulnerability_count.vue';
 import SeverityBadge from 'ee/vue_shared/security_reports/components/severity_badge.vue';
 
 describe('Vulnerability Count', () => {

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

@@ -2,15 +2,15 @@ import { GlDeprecatedSkeletonLoading as GlSkeletonLoading, GlTable, GlTruncate }
 import { capitalize } from 'lodash';
 import DashboardHasNoVulnerabilities from 'ee/security_dashboard/components/empty_states/dashboard_has_no_vulnerabilities.vue';
 import FiltersProducedNoResults from 'ee/security_dashboard/components/empty_states/filters_produced_no_results.vue';
-import IssuesBadge from 'ee/security_dashboard/components/issues_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/security_dashboard/components/vulnerability_list.vue';
+import IssuesBadge from 'ee/security_dashboard/components/shared/issues_badge.vue';
+import SelectionSummary from 'ee/security_dashboard/components/shared/selection_summary.vue';
+import VulnerabilityCommentIcon from 'ee/security_dashboard/components/shared/vulnerability_comment_icon.vue';
+import VulnerabilityList from 'ee/security_dashboard/components/shared/vulnerability_list.vue';
 import { DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
 import RemediatedBadge from 'ee/vulnerabilities/components/remediated_badge.vue';
 import { trimText } from 'helpers/text_helper';
 import { mountExtended } from 'helpers/vue_test_utils_helper';
-import { generateVulnerabilities, vulnerabilities } from './mock_data';
+import { generateVulnerabilities, vulnerabilities } from '../mock_data';
 
 describe('Vulnerability list component', () => {
   let wrapper;

ee/spec/frontend/security_dashboard/components/vulnerability_report_layout_spec.js → ee/spec/frontend/security_dashboard/components/shared/vulnerability_report_layout_spec.js

 import { shallowMount } from '@vue/test-utils';
-import VulnerabilityReportLayout from 'ee/security_dashboard/components/vulnerability_report_layout.vue';
+import VulnerabilityReportLayout from 'ee/security_dashboard/components/shared/vulnerability_report_layout.vue';
 
 describe('Vulnerability Report Layout component', () => {
   let wrapper;

ee/spec/frontend/security_dashboard/components/vulnerability_report_spec.js → ee/spec/frontend/security_dashboard/components/shared/vulnerability_report_spec.js

@@ -4,25 +4,25 @@ import Cookies from 'js-cookie';
 import { PortalTarget } from 'portal-vue';
 import { nextTick } from 'vue';
 import VueApollo from 'vue-apollo';
-import AutoFixUserCallout from 'ee/security_dashboard/components/auto_fix_user_callout.vue';
-import CsvExportButton from 'ee/security_dashboard/components/csv_export_button.vue';
 import DashboardNotConfiguredGroup from 'ee/security_dashboard/components/empty_states/group_dashboard_not_configured.vue';
 import DashboardNotConfiguredInstance from 'ee/security_dashboard/components/empty_states/instance_dashboard_not_configured.vue';
 import DashboardNotConfiguredProject from 'ee/security_dashboard/components/empty_states/reports_not_configured.vue';
-import Filters from 'ee/security_dashboard/components/first_class_vulnerability_filters.vue';
 import GroupVulnerabilities from 'ee/security_dashboard/components/group/group_vulnerabilities.vue';
 import InstanceVulnerabilities from 'ee/security_dashboard/components/instance/instance_vulnerabilities.vue';
 import ProjectVulnerabilities from 'ee/security_dashboard/components/project/project_vulnerabilities.vue';
-import ProjectPipelineStatus from 'ee/security_dashboard/components/project_pipeline_status.vue';
+import AutoFixUserCallout from 'ee/security_dashboard/components/shared/auto_fix_user_callout.vue';
+import CsvExportButton from 'ee/security_dashboard/components/shared/csv_export_button.vue';
+import Filters from 'ee/security_dashboard/components/shared/filters/filters_layout.vue';
+import ProjectPipelineStatus from 'ee/security_dashboard/components/shared/project_pipeline_status.vue';
 import SurveyRequestBanner from 'ee/security_dashboard/components/shared/survey_request_banner.vue';
-import VulnerabilitiesCountList from 'ee/security_dashboard/components/vulnerability_count_list.vue';
-import VulnerabilityReport from 'ee/security_dashboard/components/vulnerability_report.vue';
-import VulnerabilityReportLayout from 'ee/security_dashboard/components/vulnerability_report_layout.vue';
+import VulnerabilitiesCountList from 'ee/security_dashboard/components/shared/vulnerability_count_list.vue';
+import VulnerabilityReport from 'ee/security_dashboard/components/shared/vulnerability_report.vue';
+import VulnerabilityReportLayout from 'ee/security_dashboard/components/shared/vulnerability_report_layout.vue';
 import groupProjectsQuery from 'ee/security_dashboard/graphql/queries/group_projects.query.graphql';
 import instanceProjectsQuery from 'ee/security_dashboard/graphql/queries/instance_projects.query.graphql';
 import { DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
 import createApolloProvider from 'helpers/mock_apollo_helper';
-import { mockVulnerableProjectsInstance, mockVulnerableProjectsGroup } from '../mock_data';
+import { mockVulnerableProjectsInstance, mockVulnerableProjectsGroup } from '../../mock_data';
 
 describe('Vulnerability Report', () => {
   let wrapper;

qa/qa/ee/page/group/secure/show.rb

@@ -12,7 +12,7 @@ module QA
               element :security_report_content, required: true
             end
 
-            view 'ee/app/assets/javascripts/security_dashboard/components/first_class_vulnerability_severities.vue' do
+            view 'ee/app/assets/javascripts/security_dashboard/components/shared/project_security_status_chart.vue' do
               element :project_name_text, required: true
             end
 

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/security_dashboard/components/vulnerability_list.vue' do
+            view 'ee/app/assets/javascripts/security_dashboard/components/shared/vulnerability_list.vue' do
               element :vulnerability
             end