Merge branch 'add_severity_sorting_for_group_level_sbom' into 'master'

Add severity sort for group level dependencies

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143087



Merged-by: Samantha Ming <sming@gitlab.com>
Approved-by: David Pisek <dpisek@gitlab.com>
Approved-by: Samantha Ming <sming@gitlab.com>
Reviewed-by: David Pisek <dpisek@gitlab.com>
Co-authored-by: Zamir Martins Filho <zfilho@gitlab.com>

ee/app/assets/javascripts/dependencies/components/app.vue

@@ -13,11 +13,7 @@ import { mapActions, mapGetters, mapState } from 'vuex';
 import { __, s__ } from '~/locale';
 import { DEPENDENCY_LIST_TYPES } from '../store/constants';
 import { NAMESPACE_PROJECT } from '../constants';
-import {
-  REPORT_STATUS,
-  SORT_FIELD_SEVERITY,
-  SORT_FIELD_PACKAGER,
-} from '../store/modules/list/constants';
+import { REPORT_STATUS, SORT_FIELD_SEVERITY } from '../store/modules/list/constants';
 import DependenciesActions from './dependencies_actions.vue';
 import DependencyListIncompleteAlert from './dependency_list_incomplete_alert.vue';
 import DependencyListJobFailedAlert from './dependency_list_job_failed_alert.vue';
@@ -124,7 +120,7 @@ export default {
   created() {
     this.setDependenciesEndpoint(this.endpoint);
     this.setExportDependenciesEndpoint(this.exportEndpoint);
-    this.setSortField(this.isProjectNamespace ? SORT_FIELD_SEVERITY : SORT_FIELD_PACKAGER);
+    this.setSortField(SORT_FIELD_SEVERITY);
   },
   methods: {
     ...mapActions([

ee/app/assets/javascripts/dependencies/store/modules/list/constants.js

@@ -23,6 +23,7 @@ export const SORT_FIELDS_GROUP = pick(SORT_FIELDS, [
   SORT_FIELD_NAME,
   SORT_FIELD_PACKAGER,
   SORT_FIELD_LICENSE,
+  SORT_FIELD_SEVERITY,
 ]);
 
 export const SORT_ASCENDING = 'asc';

ee/spec/frontend/dependencies/components/app_spec.js

@@ -174,9 +174,9 @@ describe('DependenciesApp component', () => {
         factory({ provide: { namespaceType: 'group' } });
       });
 
-      it('dispatches setSortField with packager', () => {
+      it('dispatches setSortField with severity', () => {
         expect(store.dispatch.mock.calls).toEqual(
-          expect.arrayContaining([['setSortField', 'packager']]),
+          expect.arrayContaining([['setSortField', 'severity']]),
         );
       });
     });