diff --git a/.eslintrc.yml b/.eslintrc.yml index 72c33873adabf9cf76f4347cabf6c45b71e91875..7f45fd912a91cd531c04a989854f3a2d357d7116 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -99,7 +99,7 @@ rules: message: 'Migrate to GlSkeletonLoader, or import GlDeprecatedSkeletonLoading.' overrides: - files: - - '{,ee/,jh/}spec/frontend*/**/*' + - '{,ee/,jh/}spec/frontend*/**/*' rules: '@gitlab/require-i18n-strings': off '@gitlab/no-runtime-template-compiler': off @@ -139,11 +139,13 @@ overrides: parser: '@graphql-eslint/eslint-plugin' operations: - '{,ee/,jh/}app/**/*.graphql' - # You can run `bundle exec rake gitlab:graphql:schema:dump` and then uncomment this line - # schema: './tmp/tests/graphql/gitlab_schema.graphql' + # You can run `bundle exec rake gitlab:graphql:schema:dump` and then uncomment this line + # schema: './tmp/tests/graphql/gitlab_schema.graphql' rules: filenames/match-regex: off spaced-comment: off + # TODO: We need a way to include this rule + support ee_else_ce fragments + #'@graphql-eslint/unique-fragment-name': error # TODO: Uncomment these rules when then `schema` is available #'@graphql-eslint/fragments-on-composite-type': error #'@graphql-eslint/known-argument-names': error @@ -151,4 +153,3 @@ overrides: '@graphql-eslint/no-anonymous-operations': error '@graphql-eslint/unique-operation-name': error '@graphql-eslint/require-id-when-available': error - '@graphql-eslint/unique-fragment-name': error diff --git a/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql b/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql index 8c0f1762d914eec3a245d68ea577aa535d906e25..df6ad0b712dd5dbdb1ef06c9c10e3976e264d506 100644 --- a/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql +++ b/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql @@ -1,5 +1,3 @@ -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment HttpIntegrationPayloadData on AlertManagementHttpIntegration { id } diff --git a/app/assets/javascripts/boards/graphql/board.fragment.graphql b/app/assets/javascripts/boards/graphql/board.fragment.graphql index c4380a8744df9c01eff5039da89f91f1ac2b07b0..872a4c4afbcff93538eaec4e65888ca62be99ab7 100644 --- a/app/assets/javascripts/boards/graphql/board.fragment.graphql +++ b/app/assets/javascripts/boards/graphql/board.fragment.graphql @@ -1,5 +1,3 @@ -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment BoardFragment on Board { id name diff --git a/app/assets/javascripts/boards/graphql/board_list.fragment.graphql b/app/assets/javascripts/boards/graphql/board_list.fragment.graphql index 5c7442dce6804def70b338e50b21b67cf1db9773..bbf3314377ea1a9d7a42db0e5edc24c97ecf9f2e 100644 --- a/app/assets/javascripts/boards/graphql/board_list.fragment.graphql +++ b/app/assets/javascripts/boards/graphql/board_list.fragment.graphql @@ -1,7 +1,5 @@ #import "./board_list_shared.fragment.graphql" -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment BoardListFragment on BoardList { ...BoardListShared } diff --git a/app/assets/javascripts/boards/graphql/board_scope.fragment.graphql b/app/assets/javascripts/boards/graphql/board_scope.fragment.graphql index 4e0a62468792e657ea68684091e0982989ddb5e3..57f51822d91ee62eb4a148c70197061d816a3dba 100644 --- a/app/assets/javascripts/boards/graphql/board_scope.fragment.graphql +++ b/app/assets/javascripts/boards/graphql/board_scope.fragment.graphql @@ -1,5 +1,3 @@ -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment BoardScopeFragment on Board { id name diff --git a/app/assets/javascripts/boards/graphql/issue.fragment.graphql b/app/assets/javascripts/boards/graphql/issue.fragment.graphql index 8525b9065ca74503c9e3a09b40ad253a005dc0f3..53fe6fdc59e6d20102d03de92457d893061e6771 100644 --- a/app/assets/javascripts/boards/graphql/issue.fragment.graphql +++ b/app/assets/javascripts/boards/graphql/issue.fragment.graphql @@ -1,7 +1,5 @@ #import "~/graphql_shared/fragments/issue.fragment.graphql" -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment Issue on Issue { id ...IssueNode diff --git a/app/assets/javascripts/graphql_shared/fragments/iteration.fragment.graphql b/app/assets/javascripts/graphql_shared/fragments/iteration.fragment.graphql index 1fe85154d8d01e7171c2e8f666f4653341b3a808..78a368089a80e02de8f0bb23d781f803b98d38ce 100644 --- a/app/assets/javascripts/graphql_shared/fragments/iteration.fragment.graphql +++ b/app/assets/javascripts/graphql_shared/fragments/iteration.fragment.graphql @@ -1,4 +1,4 @@ -fragment IterationShared on Iteration { +fragment Iteration on Iteration { id title } diff --git a/app/assets/javascripts/graphql_shared/fragments/page_info_cursors_only.fragment.graphql b/app/assets/javascripts/graphql_shared/fragments/page_info_cursors_only.fragment.graphql new file mode 100644 index 0000000000000000000000000000000000000000..22bcefbecd3c72583999797219149e4b0ddb4629 --- /dev/null +++ b/app/assets/javascripts/graphql_shared/fragments/page_info_cursors_only.fragment.graphql @@ -0,0 +1,4 @@ +fragment PageInfo on PageInfo { + startCursor + endCursor +} diff --git a/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql b/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql index 5b2f0392232edd4abfd1be1417900fcde9bd8bdf..b72941966c6e37ec6e0515a6fb47f0a9ca1fe67d 100644 --- a/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql +++ b/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql @@ -1,5 +1,4 @@ -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/require-id-when-available, @graphql-eslint/unique-fragment-name +# eslint-disable-next-line @graphql-eslint/require-id-when-available fragment IncidentFields on Issue { severity escalationStatus diff --git a/app/assets/javascripts/issues/list/queries/label.fragment.graphql b/app/assets/javascripts/issues/list/queries/label.fragment.graphql new file mode 100644 index 0000000000000000000000000000000000000000..bb1d8f1ac9b1ce34cb7cf62e7513f4ab482317c3 --- /dev/null +++ b/app/assets/javascripts/issues/list/queries/label.fragment.graphql @@ -0,0 +1,6 @@ +fragment Label on Label { + id + color + textColor + title +} diff --git a/app/assets/javascripts/issues/list/queries/search_labels.query.graphql b/app/assets/javascripts/issues/list/queries/search_labels.query.graphql index df563fe19252940f85791b89ffd2445e3638d054..44b57317161e77d631bdb5083509b0a94f737d0a 100644 --- a/app/assets/javascripts/issues/list/queries/search_labels.query.graphql +++ b/app/assets/javascripts/issues/list/queries/search_labels.query.graphql @@ -1,4 +1,4 @@ -#import "~/graphql_shared/fragments/label.fragment.graphql" +#import "./label.fragment.graphql" query searchLabels($fullPath: ID!, $search: String, $isProject: Boolean = false) { group(fullPath: $fullPath) @skip(if: $isProject) { diff --git a/app/assets/javascripts/issues/list/queries/search_users.query.graphql b/app/assets/javascripts/issues/list/queries/search_users.query.graphql index 52c7963cb7cf1a6ebe92481a042e06796384d09c..46b48e4e41c92bf3f549295502b287054a6a832a 100644 --- a/app/assets/javascripts/issues/list/queries/search_users.query.graphql +++ b/app/assets/javascripts/issues/list/queries/search_users.query.graphql @@ -1,4 +1,4 @@ -#import "~/graphql_shared/fragments/user.fragment.graphql" +#import "./user.fragment.graphql" query searchUsers($fullPath: ID!, $search: String, $isProject: Boolean = false) { group(fullPath: $fullPath) @skip(if: $isProject) { diff --git a/app/assets/javascripts/issues/list/queries/user.fragment.graphql b/app/assets/javascripts/issues/list/queries/user.fragment.graphql new file mode 100644 index 0000000000000000000000000000000000000000..3e5bc0f7b939f48e5d62a01b9216cc8f625307fb --- /dev/null +++ b/app/assets/javascripts/issues/list/queries/user.fragment.graphql @@ -0,0 +1,6 @@ +fragment User on User { + id + avatarUrl + name + username +} diff --git a/app/assets/javascripts/repository/queries/commit.fragment.graphql b/app/assets/javascripts/repository/queries/commit.fragment.graphql index a6063c689dc1ca944890c2231f7a87f5b4ddff40..b046fc1f730209033a2cd003e3fafd2773f4f351 100644 --- a/app/assets/javascripts/repository/queries/commit.fragment.graphql +++ b/app/assets/javascripts/repository/queries/commit.fragment.graphql @@ -1,5 +1,3 @@ -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment TreeEntryCommit on LogTreeCommit { sha message diff --git a/app/assets/javascripts/repository/queries/path_locks.fragment.graphql b/app/assets/javascripts/repository/queries/path_locks.fragment.graphql index 96b6523361ef47a4d3788a92082d557fdd0b9e4f..868a513362dfeaf3c917ab39c941a0bd2052d1ee 100644 --- a/app/assets/javascripts/repository/queries/path_locks.fragment.graphql +++ b/app/assets/javascripts/repository/queries/path_locks.fragment.graphql @@ -1,5 +1,3 @@ -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment ProjectPathLocksFragment on Project { id } diff --git a/app/assets/javascripts/runner/graphql/details/runner_details.fragment.graphql b/app/assets/javascripts/runner/graphql/details/runner_details.fragment.graphql index 4e30e30edc5e2b98da8c5523f117b9ef8410a3ea..2449ee0fc0f91cc8386a5f3bfa43ce4860e301cf 100644 --- a/app/assets/javascripts/runner/graphql/details/runner_details.fragment.graphql +++ b/app/assets/javascripts/runner/graphql/details/runner_details.fragment.graphql @@ -1,7 +1,5 @@ #import "./runner_details_shared.fragment.graphql" -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment RunnerDetails on CiRunner { ...RunnerDetailsShared } diff --git a/app/assets/javascripts/sidebar/queries/group_milestones.query.graphql b/app/assets/javascripts/sidebar/queries/group_milestones.query.graphql index b00ad3d483e37472270c4ac1cb072e4d8395b8ed..dceab61ed26311ce2c953ae26c045538110832cd 100644 --- a/app/assets/javascripts/sidebar/queries/group_milestones.query.graphql +++ b/app/assets/javascripts/sidebar/queries/group_milestones.query.graphql @@ -12,7 +12,7 @@ query groupMilestones($fullPath: ID!, $title: String, $state: MilestoneStateEnum includeAncestors: true ) { nodes { - ...SidebarMilestoneFragment + ...MilestoneFragment state } } diff --git a/app/assets/javascripts/sidebar/queries/merge_request_milestone.query.graphql b/app/assets/javascripts/sidebar/queries/merge_request_milestone.query.graphql index 9983c79d263ccdf6d5bb773fa40f4aba845d1bd3..b0a16677cf2eb3cf771dabdd59acb2f99028bf5e 100644 --- a/app/assets/javascripts/sidebar/queries/merge_request_milestone.query.graphql +++ b/app/assets/javascripts/sidebar/queries/merge_request_milestone.query.graphql @@ -8,7 +8,7 @@ query mergeRequestMilestone($fullPath: ID!, $iid: String!) { __typename id attribute: milestone { - ...SidebarMilestoneFragment + ...MilestoneFragment } } } diff --git a/app/assets/javascripts/sidebar/queries/milestone.fragment.graphql b/app/assets/javascripts/sidebar/queries/milestone.fragment.graphql index 570e88966e536a1ea17d5475e9d2ab6b9c0f0ad6..d4f7e703692796ffca8fb31e66369c536b9b8cf2 100644 --- a/app/assets/javascripts/sidebar/queries/milestone.fragment.graphql +++ b/app/assets/javascripts/sidebar/queries/milestone.fragment.graphql @@ -1,4 +1,4 @@ -fragment SidebarMilestoneFragment on Milestone { +fragment MilestoneFragment on Milestone { id title webUrl: webPath diff --git a/app/assets/javascripts/sidebar/queries/project_issue_milestone.query.graphql b/app/assets/javascripts/sidebar/queries/project_issue_milestone.query.graphql index d481324e56a08f1bff5447f945af7f8d1c608caa..c7f3adc9aca147d738f2fb1ec0879e083e78b5dd 100644 --- a/app/assets/javascripts/sidebar/queries/project_issue_milestone.query.graphql +++ b/app/assets/javascripts/sidebar/queries/project_issue_milestone.query.graphql @@ -8,7 +8,7 @@ query projectIssueMilestone($fullPath: ID!, $iid: String!) { __typename id attribute: milestone { - ...SidebarMilestoneFragment + ...MilestoneFragment } } } diff --git a/app/assets/javascripts/sidebar/queries/project_milestones.query.graphql b/app/assets/javascripts/sidebar/queries/project_milestones.query.graphql index e431b331c5d483ce3c57d8e9bc786771dff064a0..d9eab18628dd2b02620366c9c2c0048822029f94 100644 --- a/app/assets/javascripts/sidebar/queries/project_milestones.query.graphql +++ b/app/assets/javascripts/sidebar/queries/project_milestones.query.graphql @@ -12,7 +12,7 @@ query projectMilestones($fullPath: ID!, $title: String, $state: MilestoneStateEn includeAncestors: true ) { nodes { - ...SidebarMilestoneFragment + ...MilestoneFragment state } } diff --git a/app/graphql/queries/repository/files.query.graphql b/app/graphql/queries/repository/files.query.graphql index 5a352ee2a5aa3112035e458af852aaa6fbf6b970..a83880ce69624a563b81671e5a0ed6e013a77ca2 100644 --- a/app/graphql/queries/repository/files.query.graphql +++ b/app/graphql/queries/repository/files.query.graphql @@ -1,4 +1,4 @@ -fragment LocalPageInfo on PageInfo { +fragment PageInfo on PageInfo { __typename hasNextPage hasPreviousPage @@ -6,7 +6,7 @@ fragment LocalPageInfo on PageInfo { endCursor } -fragment LocalTreeEntry on Entry { +fragment TreeEntry on Entry { __typename id sha @@ -34,12 +34,12 @@ query getFiles( edges { __typename node { - ...LocalTreeEntry + ...TreeEntry webPath } } pageInfo { - ...LocalPageInfo + ...PageInfo } } submodules(first: $pageSize, after: $nextPageCursor) { @@ -47,13 +47,13 @@ query getFiles( edges { __typename node { - ...LocalTreeEntry + ...TreeEntry webUrl treeUrl } } pageInfo { - ...LocalPageInfo + ...PageInfo } } blobs(first: $pageSize, after: $nextPageCursor) { @@ -61,14 +61,14 @@ query getFiles( edges { __typename node { - ...LocalTreeEntry + ...TreeEntry mode webPath lfsOid } } pageInfo { - ...LocalPageInfo + ...PageInfo } } } diff --git a/ee/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql b/ee/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql index b0c766882b2ee0f274f687311864c75bfdd47ed3..95a59fd7a5630b3add2d53831a3e06259a2f6881 100644 --- a/ee/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql +++ b/ee/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql @@ -1,5 +1,3 @@ -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment HttpIntegrationPayloadData on AlertManagementHttpIntegration { id payloadExample diff --git a/ee/app/assets/javascripts/boards/graphql/board.fragment.graphql b/ee/app/assets/javascripts/boards/graphql/board.fragment.graphql index df853b772b8b3a5165b92f79b999fed39567e6cf..0ed43e7f6a30a9fc57890230a7c7a6fb24015a3f 100644 --- a/ee/app/assets/javascripts/boards/graphql/board.fragment.graphql +++ b/ee/app/assets/javascripts/boards/graphql/board.fragment.graphql @@ -1,5 +1,3 @@ -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment BoardFragment on Board { id name diff --git a/ee/app/assets/javascripts/boards/graphql/board_list.fragment.graphql b/ee/app/assets/javascripts/boards/graphql/board_list.fragment.graphql index ab450a8aad491661948eb6a9bd1aaf69ae45e685..8ac1e34c11fdc53e2ba91fffd61d4be06ce4535c 100644 --- a/ee/app/assets/javascripts/boards/graphql/board_list.fragment.graphql +++ b/ee/app/assets/javascripts/boards/graphql/board_list.fragment.graphql @@ -1,7 +1,5 @@ #import "~/boards/graphql/board_list_shared.fragment.graphql" -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment BoardListFragment on BoardList { ...BoardListShared maxIssueCount diff --git a/ee/app/assets/javascripts/boards/graphql/board_scope.fragment.graphql b/ee/app/assets/javascripts/boards/graphql/board_scope.fragment.graphql index cd0535c8c0a7431a356eec3575a22bed00ee5ccc..ae3d5f97509894f4061f95e93a76203a79c2984c 100644 --- a/ee/app/assets/javascripts/boards/graphql/board_scope.fragment.graphql +++ b/ee/app/assets/javascripts/boards/graphql/board_scope.fragment.graphql @@ -2,8 +2,6 @@ #import "~/graphql_shared/fragments/label.fragment.graphql" #import "~/graphql_shared/fragments/iteration.fragment.graphql" -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment BoardScopeFragment on Board { id name @@ -22,7 +20,7 @@ fragment BoardScopeFragment on Board { } } iteration { - ...IterationShared + ...Iteration } iterationCadence { id diff --git a/ee/app/assets/javascripts/boards/graphql/issue.fragment.graphql b/ee/app/assets/javascripts/boards/graphql/issue.fragment.graphql index 537650622101d3e2abf8719d38e98570da16456e..3279fabf77a8a77b5244c685732af46e9cb1e22f 100644 --- a/ee/app/assets/javascripts/boards/graphql/issue.fragment.graphql +++ b/ee/app/assets/javascripts/boards/graphql/issue.fragment.graphql @@ -1,7 +1,5 @@ #import "~/graphql_shared/fragments/issue.fragment.graphql" -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment Issue on Issue { ...IssueNode id diff --git a/ee/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql b/ee/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql index 77e2451c8edbd356d7c5e94c6cd9be4db0037c85..ad78ec9ad45af96043b578f40e488f7a33222e5a 100644 --- a/ee/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql +++ b/ee/app/assets/javascripts/incidents/graphql/fragments/incident_fields.fragment.graphql @@ -1,5 +1,4 @@ -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/require-id-when-available, @graphql-eslint/unique-fragment-name +# eslint-disable-next-line @graphql-eslint/require-id-when-available fragment IncidentFields on Issue { severity escalationStatus diff --git a/ee/app/assets/javascripts/related_items_tree/queries/epic_children.query.graphql b/ee/app/assets/javascripts/related_items_tree/queries/epic_children.query.graphql index eb4fa445858f50d6484df5d1eb5a9325a66f506b..61972eedbb116c93fd47b0d521b8afbe63115907 100644 --- a/ee/app/assets/javascripts/related_items_tree/queries/epic_children.query.graphql +++ b/ee/app/assets/javascripts/related_items_tree/queries/epic_children.query.graphql @@ -1,4 +1,4 @@ -fragment EpicsPageInfo on PageInfo { +fragment PageInfo on PageInfo { hasNextPage hasPreviousPage startCursor @@ -35,7 +35,7 @@ fragment RelatedTreeBaseEpic on Epic { } } -fragment LocalEpicNode on Epic { +fragment EpicNode on Epic { ...RelatedTreeBaseEpic state reference(full: true) @@ -82,16 +82,14 @@ query childItems( __typename edges { __typename - # id is defined in RelatedTreeBaseEpic nested fragment - # eslint-disable-next-line @graphql-eslint/require-id-when-available node { __typename - ...LocalEpicNode + ...EpicNode } } pageInfo { __typename - ...EpicsPageInfo + ...PageInfo } } issues(first: $pageSize, after: $issueEndCursor) { @@ -152,7 +150,7 @@ query childItems( } pageInfo { __typename - ...EpicsPageInfo + ...PageInfo } } } diff --git a/ee/app/assets/javascripts/repository/queries/commit.fragment.graphql b/ee/app/assets/javascripts/repository/queries/commit.fragment.graphql index 1c2303278befaeaf201b7df3a70c9e58d1c9173b..0b95bf037c952d069ae1db53bca6dd60838d854e 100644 --- a/ee/app/assets/javascripts/repository/queries/commit.fragment.graphql +++ b/ee/app/assets/javascripts/repository/queries/commit.fragment.graphql @@ -1,5 +1,3 @@ -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment TreeEntryCommit on LogTreeCommit { sha message diff --git a/ee/app/assets/javascripts/repository/queries/path_locks.fragment.graphql b/ee/app/assets/javascripts/repository/queries/path_locks.fragment.graphql index 5c6c88b0fe813432b44beb701675947b13f7d4d7..74a94743a1636c47c24088e866619677ff3d72ab 100644 --- a/ee/app/assets/javascripts/repository/queries/path_locks.fragment.graphql +++ b/ee/app/assets/javascripts/repository/queries/path_locks.fragment.graphql @@ -1,5 +1,3 @@ -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment ProjectPathLocksFragment on Project { id pathLocks { diff --git a/ee/app/assets/javascripts/runner/graphql/details/runner_details.fragment.graphql b/ee/app/assets/javascripts/runner/graphql/details/runner_details.fragment.graphql index b7fdd5c54c6fa812ad417b29c19bb107d6199130..9ad7cbfb1fe812e79f285074e1104259ddb0f690 100644 --- a/ee/app/assets/javascripts/runner/graphql/details/runner_details.fragment.graphql +++ b/ee/app/assets/javascripts/runner/graphql/details/runner_details.fragment.graphql @@ -1,7 +1,5 @@ #import "~/runner/graphql/details/runner_details_shared.fragment.graphql" -# This fragment is used as ee-else-ce -# eslint-disable-next-line @graphql-eslint/unique-fragment-name fragment RunnerDetails on CiRunner { ...RunnerDetailsShared publicProjectsMinutesCostFactor diff --git a/ee/app/assets/javascripts/vue_shared/components/filtered_search_bar/queries/epic.fragment.graphql b/ee/app/assets/javascripts/vue_shared/components/filtered_search_bar/queries/epic.fragment.graphql index 5d35cd674cf43d570ac9c67b7c2ce21d8de03d4e..bec43bf1fad01657b3c63adf3d6bd0e99c71d5f8 100644 --- a/ee/app/assets/javascripts/vue_shared/components/filtered_search_bar/queries/epic.fragment.graphql +++ b/ee/app/assets/javascripts/vue_shared/components/filtered_search_bar/queries/epic.fragment.graphql @@ -1,4 +1,4 @@ -fragment SearchEpicNode on Epic { +fragment EpicNode on Epic { id iid group { diff --git a/ee/app/assets/javascripts/vue_shared/components/filtered_search_bar/queries/search_epics.query.graphql b/ee/app/assets/javascripts/vue_shared/components/filtered_search_bar/queries/search_epics.query.graphql index dc091a1e96ab0736f217a143d1cff88f75275c77..000f2eccce39191192ec335edf39abb817a2ba56 100644 --- a/ee/app/assets/javascripts/vue_shared/components/filtered_search_bar/queries/search_epics.query.graphql +++ b/ee/app/assets/javascripts/vue_shared/components/filtered_search_bar/queries/search_epics.query.graphql @@ -10,7 +10,7 @@ query searchEpics($fullPath: ID!, $search: String, $state: EpicState) { includeDescendantGroups: false ) { nodes { - ...SearchEpicNode + ...EpicNode } } }