WIP: Update to GraphQL 1.8

api/app/graph/refinery/api/graphql_schema.rb

@@ -3,7 +3,7 @@
 module Refinery
   module Api
     class GraphqlSchema < GraphQL::Schema
-      # mutation Types::MutationType
+      mutation Types::MutationType
       query Types::QueryType
     end
   end

api/app/graph/refinery/api/mutations/pages/create.rb

@@ -4,21 +4,30 @@ module Refinery
   module Api
     module Mutations
       module Pages
-        class Create < GraphQL::Schema::Mutation
-          graphql_name 'CreatePage'
-          description 'Create a page'
-
-          argument :page, !Types::Pages::PageType
+        class Create < Mutations::BaseMutation
+          null true
 
-          type Types::Pages::PageType
+          graphql_name 'CreatePage'
+          description 'Create a Page'
 
-          resolve -> (obj, inputs, ctx) {
-            inputs = inputs.to_h.deep_symbolize_keys
+          field :page, Types::Pages::PageAttributes, null: true
+          field :errors, [String], null: false
 
-            page = Refinery::Page.create!(inputs[:page])
+          def resolve(page:)
+            page = Refinery::Page.create!(page)
 
-            { page: page }
-          }
+            if page.errors.empty?
+              {
+                page: page,
+                errors: []
+              }
+            else
+              {
+                page: nil,
+                errors: page.errors.full_messages
+              }
+            end
+          end
         end
       end
     end

api/app/graph/refinery/api/mutations/pages/delete.rb

@@ -4,18 +4,30 @@ module Refinery
   module Api
     module Mutations
       module Pages
-        class Delete <  Mutations::BaseMutation
+        class Delete < Mutations::BaseMutation
           graphql_name 'DeletePage'
+          description 'Delete a Page'
 
           argument :id, ID, required: true
 
-          return_field :page, Types::Pages::PageType
+          field :page, Types::Pages::PageType, null: false
+          field :errors, [String], null: false
 
-          resolve -> (id:) {
+          def resolve(id:)
             page = Refinery::Page.destroy!(id)
 
-            { page: page }
-          }
+            if page.errors.empty?
+              {
+                page: page,
+                errors: []
+              }
+            else
+              {
+                page: nil,
+                errors: page.errors.full_messages
+              }
+            end
+          end
         end
       end
     end

api/app/graph/refinery/api/mutations/pages/update.rb

@@ -4,22 +4,30 @@ module Refinery
   module Api
     module Mutations
       module Pages
-        class Update < GraphQL::Schema::Mutation
+        class Update < Mutations::BaseMutation
           graphql_name 'UpdatePage'
-          description 'Create a page'
+          description 'Update a Page'
 
-          input_field :id, !types.ID
-          input_field :page, !Inputs::Pages::PageInput
+          argument :id, ID, required: true
 
-          return_field :page, Types::Pages::PageType
+          field :page, Types::Pages::PageType, null: false
+          field :errors, [String], null: false
 
-          resolve -> (obj, inputs, ctx) {
-            inputs = inputs.to_h.deep_symbolize_keys
+          def resolve(id:, page:)
+            page = Refinery::Page.update(id, page)
 
-            page = Refinery::Page.update(inputs[:id], inputs[:page])
-
-            { page: page }
-          }
+            if page.errors.empty?
+              {
+                page: page,
+                errors: []
+              }
+            else
+              {
+                page: nil,
+                errors: page.errors.full_messages
+              }
+            end
+          end
         end
       end
     end

api/app/graph/refinery/api/resolvers/pages/page_resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Refinery
   module Api
     module Resolvers

api/app/graph/refinery/api/types/base_enum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Refinery
   module Api
     module Types

api/app/graph/refinery/api/types/base_input_object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Refinery
   module Api
     module Types

api/app/graph/refinery/api/types/base_interface.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Refinery
   module Api
     module Types

api/app/graph/refinery/api/types/base_object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Refinery
   module Api
     module Types

api/app/graph/refinery/api/types/base_union.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Refinery
   module Api
     module Types

api/app/graph/refinery/api/types/pages/page_attributes.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Refinery
+  module Api
+    module Types
+      module Pages
+        class PageAttributes < Types::BaseInputObject
+          description "Attributes for creating or updating a page"
+
+          argument :parent_id, Integer, required: false
+          argument :path, String, required: false
+          argument :show_in_menu, Boolean, required: false
+          argument :link_url, String, required: false
+          argument :menu_match, String, required: false
+          argument :deletable, Boolean, required: false
+          argument :draft, Boolean, required: false
+          argument :skip_to_first_child, Boolean, required: false
+          argument :lft, Integer, required: false
+          argument :rgt, required: false
+          argument :depth, Integer, required: false
+          argument :view_template, String, required: false
+          argument :layout_template, String, required: false
+          argument :locale, String, required: false
+          argument :title, String, required: false
+          argument :custom_slug, String, required: false
+          argument :menu_title, String, required: false
+          argument :slug, String, required: false
+          argument :meta_description, String, required: false
+          argument :browser_title, String, required: false
+
+          argument :parts, [Types::PagePart], required: false
+        end
+      end
+    end
+  end
+end
+
+

api/app/graph/refinery/api/types/pages/page_part_attributes.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Refinery
+  module Api
+    module Types
+      module Pages
+        class PagePartAttributes < Types::BaseInputObject
+          description "Attributes for creating or updating a page part"
+
+          argument :slug, String, required: false
+          argument :position, Integer, required: false
+          argument :title, String, required: false
+
+          argument :locale, String, required: false
+          argument :body, String, required: false
+        end
+      end
+    end
+  end
+end

api/app/graph/refinery/api/types/query_type.rb

@@ -14,9 +14,9 @@ class QueryType < Types::BaseObject
 
         field :page, Types::Pages::PageType,
               null: true, resolve: Resolvers::Pages::PageResolver::ById do
+          argument :id, ID, required: true
           description "Find page by id"
         end
-
       end
     end
   end

api/config/routes.rb

@@ -1,9 +1,9 @@
 Refinery::Core::Engine.routes.draw do
   namespace :api do
     post '/graphql', to: 'graphql#execute'
+  end
 
-    if Rails.env.development?
-      mount GraphiQL::Rails::Engine, at: '/graphiql', graphql_path: "/#{Refinery::Core.backend_route}/graphql"
-    end
+  if Rails.env.development?
+    mount GraphiQL::Rails::Engine, at: "/#{Refinery::Core.backend_route}/api/graphiql", graphql_path: '/api/graphql'
   end
-end
+end

api/lib/refinery/api.rb

@@ -1,5 +1,6 @@
 require 'refinerycms-core'
 require 'graphql'
+require 'graphiql/rails'
 
 module Refinery
   module Api

api/refinerycms-api.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |s|
   # Runtime dependencies
   s.add_dependency 'refinerycms-core', version
   s.add_dependency 'graphql', '~> 1.8', '>= 1.8.5'
+  s.add_dependency 'graphiql-rails', '~> 1.4'
 
   # Development dependencies (usually used for testing)
   s.add_development_dependency 'refinerycms-testing', '~> 4.0.0'
-  s.add_development_dependency 'graphiql-rails', '~> 1.4'
 
   s.required_ruby_version = Refinery::Version.required_ruby_version