From 65f1029461e23c87cf0544a74008f922165b8845 Mon Sep 17 00:00:00 2001
From: Savas Vedova <svedova@gitlab.com>
Date: Fri, 10 May 2024 09:58:08 +0200
Subject: [PATCH] Use correct query for project filter
Replace the dependency list projects query with the group and instance
level projects filter. These queries are refined for the vulnerability
reports page so it's more correct to use them. Also, this fixes a bug
which prevented displaying projects for the instance level vulnerability
report.
---
.../filtered_search/tokens/project_token.vue | 24 ++++++++++-------
.../tokens/project_token_spec.js | 26 +++++++++++++------
2 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/project_token.vue b/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/project_token.vue
index d6b57a855f80..126eef6a011b 100644
--- a/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/project_token.vue
+++ b/ee/app/assets/javascripts/security_dashboard/components/shared/filtered_search/tokens/project_token.vue
@@ -9,12 +9,19 @@ import { debounce } from 'lodash';
import { createAlert } from '~/alert';
import { getSelectedOptionsText } from '~/lib/utils/listbox_helpers';
import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
+import { DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
import { s__, __ } from '~/locale';
import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import getProjects from 'ee/dependencies/graphql/projects.query.graphql';
+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 QuerystringSync from '../../filters/querystring_sync.vue';
import eventHub from '../event_hub';
+const QUERIES = {
+ [DASHBOARD_TYPES.GROUP]: groupProjectsQuery,
+ [DASHBOARD_TYPES.INSTANCE]: instanceProjectsQuery,
+};
+
export default {
components: {
GlIcon,
@@ -23,7 +30,7 @@ export default {
GlLoadingIcon,
QuerystringSync,
},
- inject: ['groupFullPath'],
+ inject: ['groupFullPath', 'dashboardType'],
props: {
config: {
type: Object,
@@ -82,18 +89,17 @@ export default {
this.isLoadingProjects = true;
const { data } = await this.$apollo.query({
- query: getProjects,
+ query: QUERIES[this.dashboardType],
variables: {
- groupFullPath: this.groupNamespace,
+ fullPath: this.groupNamespace,
search: this.searchTerm,
- first: 50,
- includeSubgroups: true,
+ pageSize: 100,
},
});
- this.projects = data.group.projects.nodes.map((p) => ({
- ...p,
- rawId: getIdFromGraphQLId(p.id),
+ this.projects = data[this.dashboardType].projects.edges.map(({ node }) => ({
+ ...node,
+ rawId: getIdFromGraphQLId(node.id),
}));
this.projects.sort((p1, p2) => p1.name.localeCompare(p2.name));
diff --git a/ee/spec/frontend/security_dashboard/components/shared/filtered_search/tokens/project_token_spec.js b/ee/spec/frontend/security_dashboard/components/shared/filtered_search/tokens/project_token_spec.js
index 59b378672fef..cedfb44a88be 100644
--- a/ee/spec/frontend/security_dashboard/components/shared/filtered_search/tokens/project_token_spec.js
+++ b/ee/spec/frontend/security_dashboard/components/shared/filtered_search/tokens/project_token_spec.js
@@ -11,7 +11,8 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
import { stubComponent } from 'helpers/stub_component';
import ProjectToken from 'ee/security_dashboard/components/shared/filtered_search/tokens/project_token.vue';
import QuerystringSync from 'ee/security_dashboard/components/shared/filters/querystring_sync.vue';
-import getProjects from 'ee/dependencies/graphql/projects.query.graphql';
+import { DASHBOARD_TYPES } from 'ee/security_dashboard/store/constants';
+import getProjects from 'ee/security_dashboard/graphql/queries/group_projects.query.graphql';
import eventHub from 'ee/security_dashboard/components/shared/filtered_search/event_hub';
import createMockApollo from 'helpers/mock_apollo_helper';
import waitForPromises from 'helpers/wait_for_promises';
@@ -24,7 +25,6 @@ jest.mock('~/alert');
const TEST_PROJECTS = [
{
- __typename: 'Project',
id: 'gid://gitlab/Project/1',
name: 'GitLab Community Edition',
fullPath: 'gitlab-org/gitlab-ce',
@@ -32,7 +32,6 @@ const TEST_PROJECTS = [
rawId: 1,
},
{
- __typename: 'Project',
id: 'gid://gitlab/Project/2',
name: 'GitLab Enterprise Edition',
fullPath: 'gitlab-org/gitlab-ee',
@@ -56,7 +55,19 @@ describe('ee/security_dashboard/components/shared/filtered_search/tokens/project
id: 'gid://gitlab/Group/1',
__typename: 'Group',
projects: {
- nodes: TEST_PROJECTS,
+ edges: TEST_PROJECTS.map((project) => ({
+ __typename: 'ProjectEdge',
+ node: {
+ ...project,
+ __typename: 'Project',
+ },
+ })),
+ pageInfo: {
+ endCursor: 'eyJpZCI6IjE0In0',
+ hasNextPage: false,
+ __typename: 'PageInfo',
+ },
+ __typename: 'ProjectConnection',
},
},
},
@@ -89,6 +100,7 @@ describe('ee/security_dashboard/components/shared/filtered_search/tokens/project
},
provide: {
groupFullPath: TEST_GROUP,
+ dashboardType: DASHBOARD_TYPES.GROUP,
},
stubs: {
GlFilteredSearchToken: stubComponent(GlFilteredSearchToken, {
@@ -138,7 +150,7 @@ describe('ee/security_dashboard/components/shared/filtered_search/tokens/project
it('fetches the list of projects', () => {
expect(handlerMocks.getProjectHandler).toHaveBeenCalledWith(
- expect.objectContaining({ groupFullPath: TEST_GROUP, search: '', includeSubgroups: true }),
+ expect.objectContaining({ fullPath: TEST_GROUP, search: '', pageSize: 100 }),
);
});
@@ -214,9 +226,7 @@ describe('ee/security_dashboard/components/shared/filtered_search/tokens/project
const spy = jest.fn();
eventHub.$on('filters-changed', spy);
- const expectedIds = TEST_PROJECTS.map((project) =>
- Number(project.id.replace('gid://gitlab/Project/', '')),
- );
+ const expectedIds = TEST_PROJECTS.map((project) => project.rawId);
await selectProject(TEST_PROJECTS[0]);
await selectProject(TEST_PROJECTS[1]);
--
GitLab