diff options
Diffstat (limited to 'app/graphql/resolvers/base_issues_resolver.rb')
-rw-r--r-- | app/graphql/resolvers/base_issues_resolver.rb | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/app/graphql/resolvers/base_issues_resolver.rb b/app/graphql/resolvers/base_issues_resolver.rb index 3e7509b4068..4cae7866a49 100644 --- a/app/graphql/resolvers/base_issues_resolver.rb +++ b/app/graphql/resolvers/base_issues_resolver.rb @@ -12,12 +12,14 @@ module Resolvers required: false, description: 'Current state of this issue.' - type Types::IssueType.connection_type, null: true + # see app/graphql/types/issue_connection.rb + type 'Types::IssueConnection', null: true NON_STABLE_CURSOR_SORTS = %i[priority_asc priority_desc popularity_asc popularity_desc label_priority_asc label_priority_desc - milestone_due_asc milestone_due_desc].freeze + milestone_due_asc milestone_due_desc + escalation_status_asc escalation_status_desc].freeze def continue_issue_resolve(parent, finder, **args) issues = Gitlab::Graphql::Loaders::IssuableLoader.new(parent, finder).batching_find_all { |q| apply_lookahead(q) } @@ -31,6 +33,13 @@ module Resolvers end end + def prepare_params(args, parent) + return unless [:escalation_status_asc, :escalation_status_desc].include?(args[:sort]) + return if Feature.enabled?(:incident_escalations, parent, default_enabled: :yaml) + + args[:sort] = :created_desc # default for sort argument + end + private def unconditional_includes |