From de2f155b5b46e5ed6a76f6b9c0e952e6840866ec Mon Sep 17 00:00:00 2001 From: Rahul Chanila <rchanila@gitlab.com> Date: Mon, 22 Apr 2024 10:14:05 +0000 Subject: [PATCH] Removes unnecessary project fragment for project level packages query The project fragment is required only for group level packages query --- .../graphql/fragments/package_data.fragment.graphql | 6 ------ .../graphql/queries/get_packages.query.graphql | 5 +++++ .../packages_and_registries/package_registry/mock_data.js | 5 ++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/packages_and_registries/package_registry/graphql/fragments/package_data.fragment.graphql b/app/assets/javascripts/packages_and_registries/package_registry/graphql/fragments/package_data.fragment.graphql index bad9dc77523c9..1be3fec7e1f4e 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/graphql/fragments/package_data.fragment.graphql +++ b/app/assets/javascripts/packages_and_registries/package_registry/graphql/fragments/package_data.fragment.graphql @@ -24,12 +24,6 @@ fragment PackageData on Package { } } } - project { - id - name - fullPath - webUrl - } packageProtectionRuleExists _links { webPath diff --git a/app/assets/javascripts/packages_and_registries/package_registry/graphql/queries/get_packages.query.graphql b/app/assets/javascripts/packages_and_registries/package_registry/graphql/queries/get_packages.query.graphql index 77f09e7b76b61..26928c9e81705 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/graphql/queries/get_packages.query.graphql +++ b/app/assets/javascripts/packages_and_registries/package_registry/graphql/queries/get_packages.query.graphql @@ -54,6 +54,11 @@ query getPackages( count nodes { ...PackageData + project { + id + name + webUrl + } } pageInfo { ...PageInfo diff --git a/spec/frontend/packages_and_registries/package_registry/mock_data.js b/spec/frontend/packages_and_registries/package_registry/mock_data.js index 9dc0770a26f42..f9a5933788f69 100644 --- a/spec/frontend/packages_and_registries/package_registry/mock_data.js +++ b/spec/frontend/packages_and_registries/package_registry/mock_data.js @@ -93,7 +93,6 @@ export const dependencyLinks = () => [ export const packageProject = () => ({ id: '1', name: 'gitlab-test', - fullPath: 'gitlab-org/gitlab-test', webUrl: 'http://gdk.test:3000/gitlab-org/gitlab-test', __typename: 'Project', }); @@ -433,7 +432,7 @@ export const packagesListQuery = ({ ...packageData(), packageProtectionRuleExists: false, ...linksData, - project: packageProject(), + ...(type === 'group' && { project: packageProject() }), tags: { nodes: packageTags() }, pipelines: { nodes: packagePipelines(), @@ -442,7 +441,7 @@ export const packagesListQuery = ({ { ...packageData(), packageProtectionRuleExists: false, - project: packageProject(), + ...(type === 'group' && { project: packageProject() }), tags: { nodes: [] }, pipelines: { nodes: [] }, ...linksData, -- GitLab