reload onegraph schema on header change (#1810)

hasura · Mar 18, 2019 · bcb3fb4 · bcb3fb4
1 parent 040bef2
commit bcb3fb4
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 2 deletions.
diff --git a/console/src/components/ApiExplorer/GraphiQLWrapper.js b/console/src/components/ApiExplorer/GraphiQLWrapper.js
@@ -143,6 +143,7 @@ class GraphiQLWrapper extends Component {
             renderGraphiql={renderGraphiql}
             endpoint={graphqlNetworkData.url}
             headers={graphqlNetworkData.headers}
+            headerFocus={headerFocus}
             query={queryString}
           />
         </div>

diff --git a/console/src/components/ApiExplorer/OneGraphExplorer.js b/console/src/components/ApiExplorer/OneGraphExplorer.js
@@ -19,9 +19,39 @@ class OneGraphExplorer extends React.Component {
     schema: null,
     query: this.props.query,
     isResizing: false,
+    headers: []
   };
 
   componentDidMount() {
+    this.introspect();
+  }
+
+  componentDidUpdate() {
+    if (this.shouldIntrospect(this.props.headers, this.state.headers)) {
+      this.introspect()
+    }
+  }
+
+  shouldIntrospect(newHeadersArray, oldHeadersArray) {
+    if (this.props.headerFocus) {
+      return false;
+    }
+    const oldHeaders = getHeadersAsJSON(oldHeadersArray);
+    const headers = getHeadersAsJSON(newHeadersArray);
+    if (Object.keys(oldHeaders).length !== Object.keys(headers).length) {
+      return true;
+    }
+    for (var i = Object.keys(headers).length - 1; i >= 0; i--) {
+      const key = Object.keys(headers)[i];
+      const value = headers[key];
+      if (oldHeaders[key] !== value) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  introspect() {
     const { endpoint, headers } = this.props;
     fetch(endpoint, {
       method: 'POST',
@@ -34,8 +64,15 @@ class OneGraphExplorer extends React.Component {
       .then(result => {
         this.setState({
           schema: buildClientSchema(result.data),
+          headers: JSON.parse(JSON.stringify(headers))
         });
-      });
+      })
+      .catch(error => {
+        this.setState({
+          schema: null,
+          headers: JSON.parse(JSON.stringify(headers))
+        });
+      })
   }
 
   onExplorerResize = e => {

diff --git a/console/src/components/ApiExplorer/utils.js b/console/src/components/ApiExplorer/utils.js
@@ -1,4 +1,4 @@
-const getHeadersAsJSON = headers => {
+const getHeadersAsJSON = (headers = []) => {
   const headerJSON = {};
   const nonEmptyHeaders = headers.filter(header => {
     return header.key && header.isActive;