Move the root definition to the end of the list

Paradem · Apr 18, 2024 · 820cef9 · 820cef9
1 parent 2bb0b16
commit 820cef9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/lib/dato_cms_graphql/rails/routing.rb b/lib/dato_cms_graphql/rails/routing.rb
@@ -4,19 +4,17 @@ def self.draw_routes(base_class)
       ::Rails.application.routes.draw do
         scope "(:locale)", locale: I18n.default_locale do
           # Queries that represent collections of pages.
-          DatoCmsGraphql.renderable.each do |query|
+          DatoCmsGraphql.renderable.select { |q| !q.route.blank? }.each do |query|
             controller = query.plural_name.underscore
-
-            if query.route.blank?
-              next
-            else
-              get(
-                query.route,
-                to: "#{controller}#show",
-                constraints: lambda { |request| base_class.allow?(query.query_name, request) }
-              )
-            end
+            get(
+              query.route,
+              to: "#{controller}#show",
+              constraints: lambda { |request| base_class.allow?(query.query_name, request) }
+            )
           end
+
+          home = DatoCmsGraphql.renderable.find { |q| q.route.blank? }
+          root "#{home.plural_name.underscore}#show"
         end
       end
     end

diff --git a/lib/dato_cms_graphql/version.rb b/lib/dato_cms_graphql/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatoCmsGraphql
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end