Upgrade graphql to 1.12.0 (decidim#7201)

alecslupu · web-flow · commit df4914b82362 · 2021-01-25T16:26:51.000+01:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -451,7 +451,7 @@ GEM
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.11.5)
+    graphql (1.12.0)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
diff --git a/decidim-api/lib/decidim/api/schema.rb b/decidim-api/lib/decidim/api/schema.rb
@@ -12,12 +12,6 @@ class Schema < GraphQL::Schema
       max_complexity 300
 
       orphan_types(Api.orphan_types)
-      # Opt in to the new runtime (default in future graphql-ruby versions)
-      use GraphQL::Execution::Interpreter
-      use GraphQL::Analysis::AST
-
-      # Add built-in connections for pagination
-      use GraphQL::Pagination::Connections
     end
   end
 end
diff --git a/decidim-assemblies/lib/decidim/assemblies/query_extensions.rb b/decidim-assemblies/lib/decidim/assemblies/query_extensions.rb
@@ -47,12 +47,12 @@ def assemblies_type(id:)
 
       def assemblies(filter: {}, order: {})
         manifest = Decidim.participatory_space_manifests.select { |m| m.name == :assemblies }.first
-        Decidim::Core::ParticipatorySpaceList.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
+        Decidim::Core::ParticipatorySpaceListBase.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
       end
 
       def assembly(id: nil)
         manifest = Decidim.participatory_space_manifests.select { |m| m.name == :assemblies }.first
-        Decidim::Core::ParticipatorySpaceFinder.new(manifest: manifest).call(object, { id: id }, context)
+        Decidim::Core::ParticipatorySpaceFinderBase.new(manifest: manifest).call(object, { id: id }, context)
       end
     end
   end
diff --git a/decidim-conferences/lib/decidim/conferences/query_extensions.rb b/decidim-conferences/lib/decidim/conferences/query_extensions.rb
@@ -30,13 +30,13 @@ def self.included(type)
       def conferences(filter: {}, order: {})
         manifest = Decidim.participatory_space_manifests.select { |m| m.name == :conferences }.first
 
-        Decidim::Core::ParticipatorySpaceList.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
+        Decidim::Core::ParticipatorySpaceListBase.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
       end
 
       def conference(id: nil)
         manifest = Decidim.participatory_space_manifests.select { |m| m.name == :conferences }.first
 
-        Decidim::Core::ParticipatorySpaceFinder.new(manifest: manifest).call(object, { id: id }, context)
+        Decidim::Core::ParticipatorySpaceFinderBase.new(manifest: manifest).call(object, { id: id }, context)
       end
     end
   end
diff --git a/decidim-consultations/lib/decidim/consultations/query_extensions.rb b/decidim-consultations/lib/decidim/consultations/query_extensions.rb
@@ -30,13 +30,13 @@ def self.included(type)
       def consultations(filter: {}, order: {})
         manifest = Decidim.participatory_space_manifests.select { |m| m.name == :consultations }.first
 
-        Decidim::Core::ParticipatorySpaceList.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
+        Decidim::Core::ParticipatorySpaceListBase.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
       end
 
       def consultation(id: nil)
         manifest = Decidim.participatory_space_manifests.select { |m| m.name == :consultations }.first
 
-        Decidim::Core::ParticipatorySpaceFinder.new(manifest: manifest).call(object, { id: id }, context)
+        Decidim::Core::ParticipatorySpaceFinderBase.new(manifest: manifest).call(object, { id: id }, context)
       end
     end
   end
diff --git a/decidim-core/app/functions/decidim/core/participatory_space_finder.rb b/decidim-core/app/functions/decidim/core/participatory_space_finder.rb
diff --git a/decidim-core/app/functions/decidim/core/participatory_space_list.rb b/decidim-core/app/functions/decidim/core/participatory_space_list.rb
diff --git a/decidim-core/lib/decidim/api/functions/component_finder_base.rb b/decidim-core/lib/decidim/api/functions/component_finder_base.rb
@@ -14,7 +14,7 @@ module Core
     #
     # For an example check
     # decidim-proposals/app/types/decidim/proposals/proposals_type.rb
-    class ComponentFinderBase < GraphQL::Function
+    class ComponentFinderBase
       attr_reader :model_class
 
       def initialize(model_class:)
diff --git a/decidim-core/lib/decidim/api/functions/component_list.rb b/decidim-core/lib/decidim/api/functions/component_list.rb
@@ -14,7 +14,7 @@ module Core
     # This is used by ParticipatorySpaceInterface to apply filter/orders when
     # searching raw components. When listing properly defined components,
     # use ComponentListBase instead
-    class ComponentList < GraphQL::Function
+    class ComponentList
       include NeedsApiFilterAndOrder
       attr_reader :model_class
 
diff --git a/decidim-core/lib/decidim/api/functions/component_list_base.rb b/decidim-core/lib/decidim/api/functions/component_list_base.rb
@@ -25,7 +25,7 @@ module Core
     # For an example check
     # decidim-proposals/app/types/decidim/proposals/proposals_type.rb
     #
-    class ComponentListBase < GraphQL::Function
+    class ComponentListBase
       include NeedsApiFilterAndOrder
       attr_reader :model_class
 
diff --git a/decidim-core/lib/decidim/api/functions/needs_api_filter_and_order.rb b/decidim-core/lib/decidim/api/functions/needs_api_filter_and_order.rb
diff --git a/decidim-core/lib/decidim/api/functions/participatory_space_finder_base.rb b/decidim-core/lib/decidim/api/functions/participatory_space_finder_base.rb
@@ -5,7 +5,7 @@ module Core
     # An abstract base class resolver for the GraphQL endpoint for a single participatory space
     # Inherit from this class and add search arguments to create finder participatory classes
     # as is shown in ParticipatorySpaceFinder
-    class ParticipatorySpaceFinderBase < GraphQL::Function
+    class ParticipatorySpaceFinderBase
       attr_reader :manifest
 
       def initialize(manifest:)
diff --git a/decidim-core/lib/decidim/api/functions/participatory_space_list_base.rb b/decidim-core/lib/decidim/api/functions/participatory_space_list_base.rb
@@ -7,7 +7,7 @@ module Core
     # as is shown in ParticipatorySpaceList
     # + info:
     # https://github.com/rmosolgo/graphql-ruby/blob/v1.6.8/guides/fields/function.md
-    class ParticipatorySpaceListBase < GraphQL::Function
+    class ParticipatorySpaceListBase
       include NeedsApiFilterAndOrder
       attr_reader :manifest
 
diff --git a/decidim-core/lib/decidim/api/functions/user_entity_finder.rb b/decidim-core/lib/decidim/api/functions/user_entity_finder.rb
@@ -9,10 +9,7 @@ module Core
     #   name
     # }
     #
-    class UserEntityFinder < GraphQL::Function
-      argument :id, types.ID, "The ID of the participant"
-      argument :nickname, types.String, "The @nickname of the participant"
-
+    class UserEntityFinder
       def call(_obj, args, ctx)
         filters = {
           organization: ctx[:current_organization]
diff --git a/decidim-core/lib/decidim/api/functions/user_entity_list.rb b/decidim-core/lib/decidim/api/functions/user_entity_list.rb
@@ -9,10 +9,8 @@ module Core
     #   name
     # }
     #
-    class UserEntityList < GraphQL::Function
+    class UserEntityList
       include NeedsApiFilterAndOrder
-      argument :order, UserEntityInputSort, "Provides several methods to order the results"
-      argument :filter, UserEntityInputFilter, "Provides several methods to filter the results"
 
       def initialize
         @model_class = Decidim::UserBaseEntity
diff --git a/decidim-core/lib/decidim/core/api.rb b/decidim-core/lib/decidim/core/api.rb
@@ -2,6 +2,15 @@
 
 module Decidim
   module Core
+    autoload :ComponentFinderBase, "decidim/api/functions/component_finder_base"
+    autoload :ComponentList, "decidim/api/functions/component_list"
+    autoload :ComponentListBase, "decidim/api/functions/component_list_base"
+    autoload :NeedsApiFilterAndOrder, "decidim/api/functions/needs_api_filter_and_order"
+    autoload :ParticipatorySpaceFinderBase, "decidim/api/functions/participatory_space_finder_base"
+    autoload :ParticipatorySpaceListBase, "decidim/api/functions/participatory_space_list_base"
+    autoload :UserEntityFinder, "decidim/api/functions/user_entity_finder"
+    autoload :UserEntityList, "decidim/api/functions/user_entity_list"
+
     autoload :AmendmentType, "decidim/api/types/amendment_type"
     autoload :AreaApiType, "decidim/api/types/area_api_type"
     autoload :AreaTypeType, "decidim/api/types/area_type_type"
diff --git a/decidim-core/lib/decidim/query_extensions.rb b/decidim-core/lib/decidim/query_extensions.rb
@@ -64,12 +64,12 @@ def self.included(type)
 
     def participatory_processes(filter: {}, order: {})
       manifest = Decidim.participatory_space_manifests.select { |m| m.name == :participatory_processes }.first
-      Decidim::ParticipatoryProcesses::ParticipatoryProcessList.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
+      Decidim::Core::ParticipatorySpaceListBase.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
     end
 
     def participatory_process(id: nil, slug: nil)
       manifest = Decidim.participatory_space_manifests.select { |m| m.name == :participatory_processes }.first
-      Decidim::ParticipatoryProcesses::ParticipatoryProcessFinder.new(manifest: manifest).call(object, { id: id, slug: slug }, context)
+      Decidim::Core::ParticipatorySpaceFinderBase.new(manifest: manifest).call(object, { id: id, slug: slug }, context)
     end
 
     def component(id: {})
@@ -112,8 +112,8 @@ def metrics(names: [], space_type: nil, space_id: nil)
       end
     end
 
-    def user(id: nil)
-      Core::UserEntityFinder.new.call(object, { id: id }, context)
+    def user(id: nil, nickname: nil)
+      Core::UserEntityFinder.new.call(object, { id: id, nickname: nickname }, context)
     end
 
     def users(filter: {}, order: {})
diff --git a/decidim-generators/Gemfile.lock b/decidim-generators/Gemfile.lock
@@ -452,7 +452,7 @@ GEM
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.11.6)
+    graphql (1.12.0)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
diff --git a/decidim-initiatives/lib/decidim/initiatives/query_extensions.rb b/decidim-initiatives/lib/decidim/initiatives/query_extensions.rb
@@ -50,13 +50,13 @@ def initiatives_type(id:)
 
       def initiatives(filter: {}, order: {})
         manifest = Decidim.participatory_space_manifests.select { |m| m.name == :initiatives }.first
-        Decidim::Core::ParticipatorySpaceList.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
+        Decidim::Core::ParticipatorySpaceListBase.new(manifest: manifest).call(object, { filter: filter, order: order }, context)
       end
 
       def initiative(id: nil)
         manifest = Decidim.participatory_space_manifests.select { |m| m.name == :initiatives }.first
 
-        Decidim::Core::ParticipatorySpaceFinder.new(manifest: manifest).call(object, { id: id }, context)
+        Decidim::Core::ParticipatorySpaceFinderBase.new(manifest: manifest).call(object, { id: id }, context)
       end
     end
   end
diff --git a/decidim-participatory_processes/app/functions/decidim/participatory_processes/participatory_process_finder.rb b/decidim-participatory_processes/app/functions/decidim/participatory_processes/participatory_process_finder.rb
diff --git a/decidim-participatory_processes/app/functions/decidim/participatory_processes/participatory_process_list.rb b/decidim-participatory_processes/app/functions/decidim/participatory_processes/participatory_process_list.rb
diff --git a/decidim_app-design/Gemfile.lock b/decidim_app-design/Gemfile.lock
@@ -451,7 +451,7 @@ GEM
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.11.5)
+    graphql (1.12.0)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ module Core`
`14`	`14`	`#`
`15`	`15`	`# For an example check`
`16`	`16`	`# decidim-proposals/app/types/decidim/proposals/proposals_type.rb`
`17`		`- class ComponentFinderBase < GraphQL::Function`
	`17`	`+ class ComponentFinderBase`
`18`	`18`	`attr_reader :model_class`
`19`	`19`
`20`	`20`	`def initialize(model_class:)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ module Core`
`25`	`25`	`# For an example check`
`26`	`26`	`# decidim-proposals/app/types/decidim/proposals/proposals_type.rb`
`27`	`27`	`#`
`28`		`- class ComponentListBase < GraphQL::Function`
	`28`	`+ class ComponentListBase`
`29`	`29`	`include NeedsApiFilterAndOrder`
`30`	`30`	`attr_reader :model_class`
`31`	`31`