From d3e35f2b73bfcadb10000f9e9bff1a328c6f9673 Mon Sep 17 00:00:00 2001
From: jonson <jdeyoung@farmlogs.com>
Date: Sun, 15 Oct 2017 09:17:13 -0400
Subject: [PATCH 1/6] Add .idea

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 7bbc71c..daea7c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+.idea/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

From b04b7d2ae3a23c1dc621366f84a251034d04a4fe Mon Sep 17 00:00:00 2001
From: jonson <jdeyoung@farmlogs.com>
Date: Sun, 15 Oct 2017 09:21:16 -0400
Subject: [PATCH 2/6] Bump graphiql version, support injecting new version in
 the future

---
 flasql/graphiql.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/flasql/graphiql.py b/flasql/graphiql.py
index bb075c2..712336d 100644
--- a/flasql/graphiql.py
+++ b/flasql/graphiql.py
@@ -2,7 +2,7 @@
 
 from flask import render_template_string
 
-GRAPHIQL_VERSION = '0.7.1'
+GRAPHIQL_VERSION = '0.11.5'
 
 TEMPLATE = '''<!--
 The request to this GraphQL server provided the header "Accept: text/html"
@@ -23,11 +23,14 @@
     }
   </style>
   <meta name="referrer" content="no-referrer">
-  <link href="//cdn.jsdelivr.net/graphiql/{{graphiql_version}}/graphiql.css" rel="stylesheet" />
+
+  <script src="//cdn.jsdelivr.net/es6-promise/4.0.5/es6-promise.auto.min.js"></script>
   <script src="//cdn.jsdelivr.net/fetch/0.9.0/fetch.min.js"></script>
-  <script src="//cdn.jsdelivr.net/react/15.0.0/react.min.js"></script>
-  <script src="//cdn.jsdelivr.net/react/15.0.0/react-dom.min.js"></script>
-  <script src="//cdn.jsdelivr.net/graphiql/{{graphiql_version}}/graphiql.min.js"></script>
+  <script src="//cdn.jsdelivr.net/react/15.4.2/react.min.js"></script>
+  <script src="//cdn.jsdelivr.net/react/15.4.2/react-dom.min.js"></script>
+
+  <link href="//cdn.jsdelivr.net/npm/graphiql@{{graphiql_version}}/graphiql.css" rel="stylesheet" />
+  <script src="//cdn.jsdelivr.net/npm/graphiql@{{graphiql_version}}/graphiql.min.js"></script>
 </head>
 <body>
   <script>
@@ -125,10 +128,11 @@
 </html>'''  # noqa
 
 
-def render(params, result):
+def render(params, result, graphiql_version=GRAPHIQL_VERSION):
+    result = json.dumps(result, indent=2) if result else ""
     return render_template_string(
         TEMPLATE,
-        graphiql_version=GRAPHIQL_VERSION,
-        result=json.dumps(result, indent=2, ),
+        graphiql_version=graphiql_version or GRAPHIQL_VERSION,
+        result=result,
         params=params
     )

From a4968865367e68e8086ebc6bb3f8228554dad0e4 Mon Sep 17 00:00:00 2001
From: jonson <jdeyoung@farmlogs.com>
Date: Sun, 15 Oct 2017 09:24:47 -0400
Subject: [PATCH 3/6] Cache params

A few minor tweaks.
* Avoid re-parsing the graphql params
* Support supply a custom graphiql version
* Handle variables passed in as a string
---
 flasql/views.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/flasql/views.py b/flasql/views.py
index 5b13c42..2d69e87 100644
--- a/flasql/views.py
+++ b/flasql/views.py
@@ -41,6 +41,7 @@ def __init__(self,
                  error_handler=None,
                  result_class=None,
                  enable_graphiql=True,
+                 graphiql_version=graphiql.GRAPHIQL_VERSION,
                  context_factory=None):
 
         super(GraphQLView, self).__init__()
@@ -53,6 +54,8 @@ def __init__(self,
         self.result_class = result_class or GraphQLResult
         self.enable_graphiql = enable_graphiql
         self.context_factory = context_factory or False
+        self.graphiql_version = graphiql_version
+        self._params = None
 
     @property
     def can_display_graphiql(self):
@@ -80,26 +83,35 @@ def should_display_graphiql(self):
 
     @property
     def params(self):
+        if self._params:
+            return self._params
+
         request_keys = {'query', 'operationName', 'variables'}
 
         if request.method == 'GET':
             # we will collect the data from the query parameters,
             # such as ?query={}
-            return {k: request.args.get(k) for k in request_keys}
-
+            self._params = {k: request.args.get(k) for k in request_keys}
+            return self._params
         if request.method == 'POST':
             if request.mimetype == 'application/graphql':
                 return {'query': request.data.decode('utf8')}
 
             elif request.mimetype == 'application/json':
-                return request.json
+                payload = request.json
+                if "variables" in payload and isinstance(payload["variables"], str):
+                    payload["variables"] = json.loads(payload["variables"])
+                self._params = payload
+                return self._params
 
             elif request.mimetype in ('application/x-www-form-urlencoded',
                                       'multipart/form-data'):
-                return request.form
+                self._params = request.form
+                return self._params
 
         # Else, return an empty map
-        return {k: None for k in request_keys}
+        self._params = {k: None for k in request_keys}
+        return self._params
 
     def format_execution_result(self, result):
         """
@@ -185,7 +197,7 @@ def get(self):
         result = self.handle_request()
 
         if self.should_display_graphiql:
-            return graphiql.render(params=self.params, result=result)
+            return graphiql.render(params=self.params, result=result, graphiql_version=self.graphiql_version)
 
         return self.result_class(result)
 

From 14dea4ce33ccf403141880773ae24f867ec5b766 Mon Sep 17 00:00:00 2001
From: jonson <jdeyoung@farmlogs.com>
Date: Mon, 16 Oct 2017 13:51:33 -0400
Subject: [PATCH 4/6] Linting

---
 flasql/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/flasql/views.py b/flasql/views.py
index 2d69e87..55e048d 100644
--- a/flasql/views.py
+++ b/flasql/views.py
@@ -197,7 +197,8 @@ def get(self):
         result = self.handle_request()
 
         if self.should_display_graphiql:
-            return graphiql.render(params=self.params, result=result, graphiql_version=self.graphiql_version)
+            return graphiql.render(params=self.params, result=result,
+                                   graphiql_version=self.graphiql_version)
 
         return self.result_class(result)
 

From 4dfc42e71ddcb49b28a37531539f65b3f6241e44 Mon Sep 17 00:00:00 2001
From: jonson <jdeyoung@farmlogs.com>
Date: Mon, 16 Oct 2017 13:52:31 -0400
Subject: [PATCH 5/6] Use flask's json wrapper

---
 flasql/graphiql.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/flasql/graphiql.py b/flasql/graphiql.py
index 712336d..0770798 100644
--- a/flasql/graphiql.py
+++ b/flasql/graphiql.py
@@ -1,6 +1,4 @@
-import json
-
-from flask import render_template_string
+from flask import render_template_string, json
 
 GRAPHIQL_VERSION = '0.11.5'
 

From 55bd7425e700931d5f25e6a14d1087cfd556ea16 Mon Sep 17 00:00:00 2001
From: jonson <jdeyoung@farmlogs.com>
Date: Mon, 16 Oct 2017 21:25:46 -0400
Subject: [PATCH 6/6] Do not update url

---
 flasql/graphiql.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/flasql/graphiql.py b/flasql/graphiql.py
index 0770798..98668c1 100644
--- a/flasql/graphiql.py
+++ b/flasql/graphiql.py
@@ -90,21 +90,14 @@
     // that it can be easily shared.
     function onEditQuery(newQuery) {
       parameters.query = newQuery;
-      updateURL();
     }
 
     function onEditVariables(newVariables) {
       parameters.variables = newVariables;
-      updateURL();
     }
 
     function onEditOperationName(newOperationName) {
       parameters.operationName = newOperationName;
-      updateURL();
-    }
-
-    function updateURL() {
-      history.replaceState(null, null, locationQuery(parameters));
     }
 
     // Render <GraphiQL /> into the body.
