Update schema and image types

Author: NathHorrigan

grapple/models.py

@@ -29,34 +29,30 @@ def __init__(self, field_name: str, field_type: type = None):
 
 
 def GraphQLString(field_name: str):
-    class Mixin(GraphQLField):
-        def __init__(self):
-            super().__init__(field_name, graphene.String)
-
+    def Mixin():
+        return GraphQLField(field_name, graphene.String)
+        
     return Mixin
 
 
 def GraphQLFloat(field_name: str):
-    class Mixin(GraphQLField):
-        def __init__(self):
-            super().__init__(field_name, graphene.Float)
-
+    def Mixin():
+        return GraphQLField(field_name, graphene.Float)
+        
     return Mixin
 
 
 def GraphQLInt(field_name: str):
-    class Mixin(GraphQLField):
-        def __init__(self):
-            super().__init__(field_name, graphene.Int)
-
+    def Mixin():
+        return GraphQLField(field_name, graphene.Int)
+        
     return Mixin
 
 
 def GraphQLBoolean(field_name: str):
-    class Mixin(GraphQLField):
-        def __init__(self):
-            super().__init__(field_name, graphene.Boolean)
-
+    def Mixin():
+        return GraphQLField(field_name, graphene.Boolean)
+        
     return Mixin
 
 
@@ -76,18 +72,18 @@ def __init__(self):
 
 def GraphQLStreamfield(field_name: str):
     from .types.streamfield import StreamFieldInterface
+    def Mixin():
+        return GraphQLField(field_name, graphene.List(StreamFieldInterface))
 
-    class Mixin(GraphQLField):
-        def __init__(self):
-            super().__init__(field_name, graphene.List(StreamFieldInterface))
-
     return Mixin
 
 
 def GraphQLImage(field_name: str):
-    from wagtail.images import get_image_model_string
-    
-    return GraphQLForeignKey(field_name, get_image_model_string())
+    def Mixin():
+        from .types.images import get_image_type, ImageObjectType
+        return GraphQLField(field_name, graphene.Field(ImageObjectType))
+
+    return Mixin
 
 
 def GraphQLDocument(field_name: str):
@@ -206,7 +202,9 @@ def serve_preview(self, request, mode_name):
             "grapple/preview.html",
             {"preview_url": self.get_preview_url(page_preview.token)},
         )
-        response.set_cookie(key="used-token", value=page_preview.token)
+        
+        # Set cookie that auto-expires after 5mins
+        response.set_cookie(key="used-token", value=page_preview.token, max_age=300)
         return response
 
     @classmethod

grapple/schema.py

@@ -1,4 +1,5 @@
 import graphene
+from graphql.validation.rules import NoUnusedFragments, specified_rules
 
 from .actions import import_apps
 from .types.pages import PagesQuery, PagesSubscription
@@ -17,12 +18,25 @@
 import_apps()
 register_streamfield_blocks()
 
-
 """
 Root schema object that graphene is pointed at.
 It inherits its queries from each of the specific type mixins.
 """
 
+# HACK: Remove NoUnusedFragments validator
+# Due to the way previews work on the frontend, we need to pass all
+# fragments into the query even if they're not used.
+# This would usually cause a validation error. There doesn't appear
+# to be a nice way to disable this validator so we monkey-patch it instead.
+
+
+# We need to update specified_rules in-place so the change appears
+# everywhere it's been imported
+
+specified_rules[:] = [
+    rule for rule in specified_rules
+    if rule is not NoUnusedFragments
+]
 
 class Query(
     graphene.ObjectType,

grapple/types/images.py

@@ -43,8 +43,10 @@ class ImageObjectType(DjangoObjectType):
         bgcolor=graphene.String(),
         jpegquality=graphene.Int(),
     )
-    traced_SVG = graphene.String()
+    traced_SVG = graphene.String(name='tracedSVG')
     base64 = graphene.String()
+    aspect_ratio = graphene.Float()
+    sizes = graphene.String()
 
     class Meta:
         model = WagtailImage
@@ -101,6 +103,15 @@ def resolve_traced_SVG(self, info):
         with open(svg_trace_image, "r") as svgFile:
             return "data:image/svg+xml," + urllib.parse.quote(svgFile.read())
 
+    def resolve_aspect_ratio(self, info, **kwargs):
+        """
+        Calculate aspect ratio for Gatsby Image.
+        """
+        return self.width / self.height
+
+    def resolve_sizes(self, info):
+        return "(max-width: {}px) 100vw, {}px".format(self.width, self.width)
+
 
 def ImagesQuery():
     from wagtail.images import get_image_model

grapple/types/pages.py

@@ -15,6 +15,7 @@
 class PageInterface(graphene.Interface):
     id = graphene.ID()
     url = graphene.String()
+    url_path = graphene.String()
     slug = graphene.String()
     depth = graphene.Int()
     page_type = graphene.String()

setup.cfg

@@ -3,7 +3,7 @@ name = wagtail-grapple
 author = Nathan Horrigan
 author_email = [email protected]
 description = A django app that speeds up and simplifies implementing a GraphQL endoint!
-version = 0.0.5
+version = 0.1.2
 url = https://github.com/NathHorrigan/wagtail-grapple
 keywords =
   wagtail