fix schema error handling

Author: timsuchanek

packages/graphql-playground-electron/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://github.com/graphcool/graphql-playground",
   "repository": "graphcool/graphql-playground",
   "description": "GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration)",
-  "version": "1.5.0-rc.2",
+  "version": "1.5.0-rc.3",
   "author": {
     "name": "Graphcool",
     "email": "[email protected]",
@@ -97,7 +97,7 @@
     "graphql-config": "^1.2.1",
     "graphql-config-extension-graphcool": "1.0.6",
     "graphql-config-extension-prisma": "0.0.4",
-    "graphql-playground-react": "1.5.0-beta.12",
+    "graphql-playground-react": "1.5.2",
     "immutable": "4.0.0-rc.9",
     "js-yaml": "^3.10.0",
     "lodash.merge": "^4.6.0",

packages/graphql-playground-electron/src/renderer/components/App.tsx

@@ -161,12 +161,14 @@ cd ${folderPath}; graphql playground`)
         'cwd',
         JSON.stringify({ cwd: configDir, id: remote.getCurrentWindow().id }),
       )
-      this.setState({
+      const state = {
         configString,
         configPath,
         config,
         folderName: path.basename(folderPath),
-      } as State)
+      }
+      this.setState(state as State)
+      this.serializeWorkspace(state)
     } catch (error) {
       alert(error)
     }
@@ -210,6 +212,12 @@ cd ${folderPath}; graphql playground`)
     window.addEventListener('keydown', this.handleKeyDown, true)
     this.consumeEvents()
     ipcRenderer.send('ready', '')
+    if (!this.state.endpoint) {
+      const workspace = this.deserializeWorkspace()
+      if (workspace) {
+        this.setState(workspace)
+      }
+    }
   }
 
   consumeEvents() {
@@ -315,9 +323,33 @@ cd ${folderPath}; graphql playground`)
       platformToken,
     }
 
+    this.serializeWorkspace(state)
+
     this.setState(state)
   }
 
+  serializeWorkspace(state) {
+    localStorage.setItem(
+      'graphql-playground-last-workspace',
+      JSON.stringify(state),
+    )
+  }
+
+  deserializeWorkspace() {
+    try {
+      const lastWorkspace = localStorage.getItem(
+        'graphql-playground-last-workspace',
+      )
+      if (lastWorkspace) {
+        return JSON.parse(lastWorkspace)
+      }
+    } catch (e) {
+      //
+    }
+
+    return undefined
+  }
+
   configContainsEndpoints(config: GraphQLConfigData): boolean {
     if (
       Object.keys((config.extensions && config.extensions.endpoints) || {})

packages/graphql-playground-electron/yarn.lock

@@ -1809,13 +1809,20 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-codemirror-graphql@0.6.12, codemirror-graphql@^0.6.11, codemirror-graphql@^0.6.12:
+codemirror-graphql@^0.6.11, codemirror-graphql@^0.6.12:
   version "0.6.12"
   resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.6.12.tgz#91a273fe5188857524a30221d06e645b4ca41f00"
   dependencies:
     graphql-language-service-interface "^1.0.16"
     graphql-language-service-parser "^0.1.14"
 
+"codemirror-graphql@git+ssh://[email protected]/timsuchanek/codemirror-graphql.git#details-fix":
+  version "0.6.12"
+  resolved "git+ssh://[email protected]/timsuchanek/codemirror-graphql.git#801ec32683c38d6dc0f8f7bc19014a111edc9ebd"
+  dependencies:
+    graphql-language-service-interface "^1.0.18"
+    graphql-language-service-parser "^1.0.18"
+
 codemirror@^5.18.2, codemirror@^5.26.0, codemirror@^5.27.4:
   version "5.33.0"
   resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.33.0.tgz#462ad9a6fe8d38b541a9536a3997e1ef93b40c6a"
@@ -3630,7 +3637,7 @@ graphql-import@^0.4.0:
     graphql "^0.12.3"
     lodash "^4.17.4"
 
-graphql-language-service-interface@^1.0.16:
+graphql-language-service-interface@^1.0.16, graphql-language-service-interface@^1.0.18:
   version "1.0.18"
   resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-1.0.18.tgz#c0fc1ef72c6f6f4bf9042bd7a8a8a66e0772caa8"
   dependencies:
@@ -3675,17 +3682,17 @@ [email protected]:
   dependencies:
     graphql-config "1.1.7"
 
-[email protected].0-beta.12:
-  version "1.5.0-beta.12"
-  resolved "https://registry.yarnpkg.com/graphql-playground-react/-/graphql-playground-react-1.5.0-beta.12.tgz#a22fb33c49903ceb388751741cacc18000210172"
+[email protected].2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/graphql-playground-react/-/graphql-playground-react-1.5.2.tgz#9dcc747cdeb5ff86290e396556dca8136f8eb980"
   dependencies:
     apollo-link "^1.0.7"
     apollo-link-http "^1.3.2"
     apollo-link-ws "^1.0.4"
     calculate-size "^1.1.1"
     classnames "^2.2.5"
     codemirror "^5.27.4"
-    codemirror-graphql "0.6.12"
+    codemirror-graphql "git+ssh://[email protected]/timsuchanek/codemirror-graphql.git#details-fix"
     copy-to-clipboard "^3.0.8"
     cuid "^1.3.8"
     graphcool-styles "0.2.7"
@@ -3712,6 +3719,7 @@ [email protected]:
     react-display-name "^0.2.3"
     react-dom "^16.2.0"
     react-helmet "^5.2.0"
+    react-input-autosize "^2.2.1"
     react-modal "^3.1.11"
     react-redux "^5.0.6"
     react-router-dom "^4.2.2"
@@ -6528,6 +6536,12 @@ react-helmet@^5.2.0:
     prop-types "^15.5.4"
     react-side-effect "^1.1.0"
 
+react-input-autosize@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-2.2.1.tgz#ec428fa15b1592994fb5f9aa15bb1eb6baf420f8"
+  dependencies:
+    prop-types "^15.5.8"
+
 react-modal@^1.6.5:
   version "1.9.7"
   resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-1.9.7.tgz#07ef56790b953e3b98ef1e2989e347983c72871d"
@@ -7663,6 +7677,18 @@ styled-components@^3.1.6:
     postcss-load-plugins "^2.2.0"
     styled-jsx "^0.5.7"
 
+"styled-jsx-postcss@git+https://github.com/timsuchanek/styled-jsx-postcss.git#build3":
+  version "0.2.0"
+  uid "677ee0fb7f9138047a00e03c8c3e44adbb33cf2a"
+  resolved "git+https://github.com/timsuchanek/styled-jsx-postcss.git#677ee0fb7f9138047a00e03c8c3e44adbb33cf2a"
+  dependencies:
+    babel-traverse "^6.21.0"
+    babylon "^6.14.1"
+    deasync "^0.1.9"
+    postcss "^5.2.8"
+    postcss-load-plugins "^2.2.0"
+    styled-jsx "^0.5.7"
+
 [email protected], styled-jsx@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/styled-jsx/-/styled-jsx-2.2.1.tgz#8b38b9e53e5d9767e392595ab1afdc8426b3ba5d"

packages/graphql-playground-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-playground-react",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "main": "./lib/lib.js",
   "typings": "./lib/lib.d.ts",
   "description": "GraphQL IDE for better development workflows (GraphQL Subscriptions, interactive docs & collaboration).",

packages/graphql-playground-react/src/components/Playground.tsx

@@ -23,6 +23,8 @@ import {
   saveConfig,
   setTracingSupported,
   injectHeaders,
+  schemaFetchingError,
+  schemaFetchingSuccess,
 } from '../state/sessions/actions'
 import { setConfigString } from '../state/general/actions'
 import { initState } from '../state/workspace/actions'
@@ -44,7 +46,6 @@ import {
 import { Session } from '../state/sessions/reducers'
 import { getWorkspaceId } from './Playground/util/getWorkspaceId'
 import { getSettings, getSettingsString } from '../state/workspace/reducers'
-import { schemaFetchingError, schemaFetchingSuccess } from '../lib'
 
 export interface Response {
   resultID: string