Merge pull request #1042 from imolorhe/staging

Staging

.travis.yml

@@ -33,14 +33,14 @@ before_script:
 # - echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" >> $HOME/.npmrc
 script:
 - ng lint
-- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn test-single-run; fi
-- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn webdriver-update-ci; ng e2e --webdriver-update=false; fi
-- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then bin/start_ci_test_server.sh; yarn test-all; bin/stop_ci_test_server.sh; fi
-- if [ ! -z "$TRAVIS_TAG" ]; then yarn build-electron; fi
-- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn build; fi # Need to generate files for deployment
+- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn test-single-run; fi # Test altair itself
+- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn webdriver-update-ci; ng e2e --webdriver-update=false; fi # Run e2e test
+- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then bin/start_ci_test_server.sh; yarn test-all; bin/stop_ci_test_server.sh; fi # All other tests e.g. lerna, electron, etc
 after_success:
   - if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then if [ ! -z "$SURGE_TOKEN" ]; then chmod ugo+x bin/surge_deploy.sh; bin/surge_deploy.sh; fi fi
 before_deploy:
+- if [ ! -z "$TRAVIS_TAG" ]; then yarn build-electron; fi
+- if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then yarn build; fi # Need to generate files for deployment
 deploy:
 - provider: releases
   api_key:
@@ -73,7 +73,7 @@ deploy:
     tags: true
     condition: $TRAVIS_OS_NAME = linux
 - provider: script
-  script: sh bin/publish_packages.sh
+  script: git diff && sh bin/publish_packages.sh
   skip_cleanup: true
   on:
     tags: true

chrome-ext-files/manifest.json

@@ -3,7 +3,7 @@
   "name": "Altair GraphQL Client",
   "short_name": "Altair",
   "description": "The only graphQL client you'll ever need.",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "icons": {
     "16": "assets/img/altair_logo_128.png",
     "48": "assets/img/altair_logo_128.png",

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "2.3.6",
+  "version": "2.3.7",
   "registry": "https://registry.npmjs.org/",
   "npmClient": "yarn"
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "altair",
   "productName": "Altair GraphQL Client",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "license": "MIT",
   "author": "Samuel Imolorhe <samuelimolo4real@gmail.com> (https://sirmuel.design/)",
   "description": "The best graphQL client you will ever need",

packages/altair-electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "altair",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "Electron wrapper for Altair",
   "main": "index.js",
   "author": "Samuel Imolorhe <samuelimolo4real@gmail.com> (https://sirmuel.design/)",
@@ -12,7 +12,7 @@
     "dev": "electron ."
   },
   "dependencies": {
-    "altair-static": "^2.3.6",
+    "altair-static": "^2.3.7",
     "electron-debug": "^3.0.1",
     "electron-is-dev": "^1.1.0",
     "electron-log": "^3.0.6",
@@ -26,12 +26,12 @@
   "devDependencies": {
     "devtron": "^1.4.0",
     "dotenv": "^8.1.0",
-    "electron": "^7.0.0",
+    "electron": "6.1.2",
     "electron-builder": "^21.2.0",
     "electron-notarize": "^0.1.1",
     "electron-reloader": "^0.3.0",
     "mocha": "^6.2.0",
-    "spectron": "^9.0.0"
+    "spectron": "8.0.0"
   },
   "repository": {
     "type": "git",

packages/altair-electron/src/window.js

@@ -85,7 +85,7 @@ const createWindow = () => {
         filePath = indexPath;
       }
 
-      fs.readFile(filePath, 'utf8', function (err, data) {
+      fs.readFile(filePath, 'utf8', function(err, data) {
         if (err) {
           return console.log('Error loading file to buffer.', err);
         }

packages/altair-electron/yarn.lock

@@ -15,18 +15,6 @@
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
-"@electron/get@^1.0.1":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.5.0.tgz#6217d9d18fb71fbd8cd2445a31aa0edc723d19dd"
-  integrity sha512-tafxBz6n08G6SX961F/h8XFtpB/DdwRvJJoDeOH9x78jDSCMQ2G/rRWqSwLFp9oeMFBJf0Pf5Kkw6TKt5w9TWg==
-  dependencies:
-    debug "^4.1.1"
-    env-paths "^2.2.0"
-    fs-extra "^8.1.0"
-    got "^9.6.0"
-    sanitize-filename "^1.6.2"
-    sumchecker "^3.0.0"
-
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -44,10 +32,10 @@
   resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
   integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
 
-"@types/node@^12.0.12":
-  version "12.11.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.6.tgz#2f8d551aef252de78f42acdccd53f5a8ce0cac4d"
-  integrity sha512-4uPUyY1Aofo1YzoypalYHNd2SnKYxH2b6LzXwpryZCJKA2XlagZSynXx5C8sfPH0r1cSltUpaVHV2q5sYXschQ==
+"@types/node@^10.12.18":
+  version "10.17.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.0.tgz#537c61a1df699a8331c79dab2ccc2c8799873c66"
+  integrity sha512-wuJwN2KV4tIRz1bu9vq5kSPasJ8IsEjZaP1ZR7KlmdUZvGF/rXy8DmXOVwUD0kAtvtJ7aqMKPqUXC0NUTDbrDg==
 
 "@types/semver@^6.0.1":
   version "6.0.2"
@@ -74,10 +62,10 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-altair-static@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/altair-static/-/altair-static-2.3.5.tgz#9d31b94815ba60108447af524bb3871240bf5145"
-  integrity sha512-xHXMGh2zgSrcv1MEQ2ZCVEH+xfAWvpW5ZWIkOvsfZpy1UtRUdGp97+80h3xkCu9VYVg8KEJ6gTjPdKLNQup/qg==
+altair-static@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/altair-static/-/altair-static-2.3.6.tgz#4c7990078a85b70d89d03e2bd4ac19c9d0963701"
+  integrity sha512-UO2MmivdpockO6m3GGDCVb8/Eo5wShOGgudqhMgpuowrMiD2RBEmctBDeFkKJC7zoGvE5FdQ1hO0iJrj+IGsJA==
 
 ansi-align@^3.0.0:
   version "3.0.0"
@@ -676,7 +664,7 @@ debug@3.2.6, debug@^3.0.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1:
+debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -825,10 +813,10 @@ electron-builder@^21.2.0:
     update-notifier "^3.0.1"
     yargs "^13.3.0"
 
-electron-chromedriver@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-7.0.0.tgz#204e1bfcdf2dfd56e5a3b8e6f37d19b1433a7937"
-  integrity sha512-7qymT0fn3VTit0peym1iz4Y+fTwq9EPsv1V9Qh+vQdoVqP/4SM9lOHrsBeuFN1JJADZLu7R119ZvMkP6EnLYhw==
+electron-chromedriver@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-6.0.0.tgz#a91b940c83f1c42ced52c9ef0605d8721613a8a2"
+  integrity sha512-UIhRl0sN5flfUjqActXsFrZQU1NmBObvlxzPnyeud8vhR67TllXCoqfvhQJmIrJAJJK+5M1DFhJ5iTGT++dvkg==
   dependencies:
     electron-download "^4.1.1"
     extract-zip "^1.6.7"
@@ -841,7 +829,7 @@ electron-debug@^3.0.1:
     electron-is-dev "^1.1.0"
     electron-localshortcut "^3.1.0"
 
-electron-download@^4.1.1:
+electron-download@^4.1.0, electron-download@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-4.1.1.tgz#02e69556705cc456e520f9e035556ed5a015ebe8"
   integrity sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==
@@ -957,13 +945,13 @@ electron-window-state@^5.0.3:
     jsonfile "^4.0.0"
     mkdirp "^0.5.1"
 
-electron@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-7.0.0.tgz#47a5b15ca213f32c20d85f82a1be615a74cdf55f"
-  integrity sha512-vrF1loRW1p0vQCbduqO0EZpo8ePJOuxUT6tSoUSU3lsbGK3VnlJop+0PpCIPzbe2K4G4Gk7WexH08V9se7mJcA==
+electron@6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-6.1.2.tgz#87ad84d9560a58c434140c70f459e97bc2dd25f5"
+  integrity sha512-zVste1obJC645RrU4PP+CqU8Yq33h8fzS7zx3tWbiNnyRzp6m7O2bpgKLJBRZ/4BPRsNCqSSXm4vimyGPUXVaw==
   dependencies:
-    "@electron/get" "^1.0.1"
-    "@types/node" "^12.0.12"
+    "@types/node" "^10.12.18"
+    electron-download "^4.1.0"
     extract-zip "^1.0.3"
 
 emoji-regex@^7.0.1:
@@ -2602,13 +2590,13 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
   integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
 
-spectron@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/spectron/-/spectron-9.0.0.tgz#6581780027172095e168353c82ed934212a0c97f"
-  integrity sha512-aMxprQ+5/8hDl27P6FafIuuL8jAueJ7WEc6S6pEEQNU7xGCMcfj0RY6TB1i9BtkazMymIxAkmwqlK233Fbhcgw==
+spectron@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/spectron/-/spectron-8.0.0.tgz#86e83c5dccb174850c052e2e718d5b1158764a52"
+  integrity sha512-MI9+lAamDnw7S0vKaxXjU3g5qaW5KANaFLc+Hgq+QmMCkQbZLt6ukFFGfalmwIuYrmq+yWQPCD4CXgt3VSHrLA==
   dependencies:
     dev-null "^0.1.1"
-    electron-chromedriver "^7.0.0"
+    electron-chromedriver "^6.0.0"
     request "^2.87.0"
     split "^1.0.0"
     webdriverio "^4.13.0"
@@ -2756,13 +2744,6 @@ sumchecker@^2.0.2:
   dependencies:
     debug "^2.2.0"
 
-sumchecker@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.0.tgz#da5457b4605184575c76540e5e99cc777cb8ce4c"
-  integrity sha512-yreseuC/z4iaodVoq07XULEOO9p4jnQazO7mbrnDSvWAU/y2cbyIKs+gWJptfcGu9R+1l27K8Rkj0bfvqnBpgQ==
-  dependencies:
-    debug "^4.1.0"
-
 supports-color@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"

packages/altair-express-middleware/package.json

@@ -1,6 +1,6 @@
 {
   "name": "altair-express-middleware",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "Express middleware for altair graphql client",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -30,7 +30,7 @@
   },
   "homepage": "https://github.com/imolorhe/altair#readme",
   "dependencies": {
-    "altair-static": "^2.3.6",
+    "altair-static": "^2.3.7",
     "express": "^4.16.2"
   },
   "devDependencies": {

packages/altair-koa-middleware/package.json

@@ -1,6 +1,6 @@
 {
   "name": "altair-koa-middleware",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "Koa middleware for altair graphql client",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
@@ -30,7 +30,7 @@
   },
   "homepage": "https://github.com/imolorhe/altair#readme",
   "dependencies": {
-    "altair-static": "^2.3.6",
+    "altair-static": "^2.3.7",
     "koa-router": "^7.4.0",
     "koa-send": "^5.0.0"
   },

packages/altair-static/package.json

@@ -1,6 +1,6 @@
 {
   "name": "altair-static",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "Static package for altair graphql client",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",

packages/gatsby-plugin-altair-graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-plugin-altair-graphql",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "A gatsby plugin for using Altair GraphQL client",
   "main": "gatsby-node.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "typescript": "^3.3.1"
   },
   "dependencies": {
-    "altair-express-middleware": "^2.3.6"
+    "altair-express-middleware": "^2.3.7"
   },
   "gitHead": "e5ce60f5a14997f1471a961ac76efacbb044df46"
 }

src/app/components/doc-viewer/doc-viewer-field/doc-viewer-field.component.html

@@ -17,30 +17,30 @@
       </div>
     </div>
   </div>
-</ng-container>
-
-<!--Field arguments-->
-<div class="doc-viewer-section doc-viewer-arguments" *ngIf="data.args && data.args.length">
-  <div class="doc-viewer-section-title">{{ 'DOCS_ARGUMENTS_TEXT' | translate }}</div>
-  <div class="doc-viewer-item doc-viewer-item-query" *ngFor="let arg of data.args; trackBy: argTrackBy">
-    <div class="doc-viewer-item-query-inner">
-      <span class="no-link-link"
-       (click)="goToType(arg.type.inspect())"
-      >
-        {{ arg.name }}
-        <span class="doc-viewer-item-value" *ngIf="arg.defaultValue && arg.defaultValue.toString">= {{ arg.defaultValue }}</span>
-      </span>
-      <span class="doc-viewer-item-type doc-viewer-item-query-type no-link-link"
-       (click)="goToType(arg.type.inspect())"
-      >
-        {{ arg.type.inspect() }}
-      </span>
-    </div>
-    <div class="doc-viewer-item-query-description" markdown>
-      {{ arg.description }}
+  <!--Field arguments-->
+  <div class="doc-viewer-section doc-viewer-arguments" *ngIf="data.args && data.args.length">
+    <div class="doc-viewer-section-title">{{ 'DOCS_ARGUMENTS_TEXT' | translate }}</div>
+    <div class="doc-viewer-item doc-viewer-item-query" *ngFor="let arg of data.args; trackBy: argTrackBy">
+      <div class="doc-viewer-item-query-inner">
+        <span class="no-link-link"
+         (click)="goToType(arg.type.inspect())"
+        >
+          {{ arg.name }}
+          <span class="doc-viewer-item-value" *ngIf="arg.defaultValue && arg.defaultValue.toString">= {{ arg.defaultValue }}</span>
+        </span>
+        <span class="doc-viewer-item-type doc-viewer-item-query-type no-link-link"
+         (click)="goToType(arg.type.inspect())"
+        >
+          {{ arg.type.inspect() }}
+        </span>
+      </div>
+      <div class="doc-viewer-item-query-description" markdown>
+        {{ arg.description }}
+      </div>
     </div>
   </div>
-</div>
+</ng-container>
+
 <!--Field type-->
 <div class="doc-viewer-section-title">{{ 'DOCS_TYPE_TEXT' | translate }}</div>
 <ng-container *ngIf="gqlSchema && data && gqlSchema.getType(cleanName(data.type.inspect()))">

src/app/components/doc-viewer/doc-viewer-type/doc-viewer-type.component.html

@@ -78,10 +78,10 @@
           {{ item.type.inspect() }}
         </span>
       </div>
-      <div class="doc-viewer-item-query-deprecated" *ngIf="item.isDeprecated">
+      <div class="doc-viewer-item-query-deprecated" *ngIf="item.isDeprecated" markdown>
         {{ 'DOCS_DEPRECATED_TEXT' | translate }}: {{ item.deprecationReason }}
       </div>
-      <div class="doc-viewer-item-query-description">
+      <div class="doc-viewer-item-query-description" markdown>
         {{ item.description }}
       </div>
       <button class="doc-viewer-item-query-add-btn"
@@ -114,7 +114,7 @@
           {{ item.name }}
         </span>
       </div>
-      <div class="doc-viewer-item-query-description">
+      <div class="doc-viewer-item-query-description" markdown>
         {{ item.description }}
       </div>
     </div>

src/app/components/doc-viewer/doc-viewer/doc-viewer.component.html

@@ -82,7 +82,7 @@
       </ng-container>
       <ng-container *ngSwitchCase="'field'">
         <app-doc-viewer-field
-         [data]="gqlSchema.getType(docView.parentType).getFields()[docView.name]"
+         [data]="gqlSchema.getType(docView.parentType) && gqlSchema.getType(docView.parentType).getFields()[docView.name]"
          [gqlSchema]="gqlSchema"
          [parentType]="docView.parentType"
          (goToFieldChange)="goToField($event.name, $event.parentType)"

src/app/components/doc-viewer/doc-viewer/doc-viewer.component.ts

@@ -386,7 +386,7 @@ export class DocViewerComponent implements OnChanges, OnDestroy {
     }
 
     // Get all the fields of the field type, if available
-    const innerFields = curType.getFields && curType.getFields();
+    const innerFields = curType && curType.getFields && curType.getFields();
     let innerFieldsData: String = null;
     if (innerFields) {
       innerFieldsData = Object.keys(innerFields).reduce((acc, cur) => {

src/app/utils/is_electron.ts

@@ -1,2 +1,2 @@
 
-export default !!(window && window['process'] && window['process'].versions['electron']);
+export default !!((window && window['process'] && window['process'].versions['electron']) || window['ipc']);

src/assets/i18n/ach-UG.json

@@ -72,6 +72,7 @@
   "CLOSE_WINDOWS_TO_THE_RIGHT_TEXT": "crwdns224:0crwdne224:0",
   "CLOSE_OTHER_WINDOWS_TEXT": "crwdns226:0crwdne226:0",
   "DUPLICATE_WINDOW_TEXT": "crwdns170:0crwdne170:0",
+  "REOPEN_CLOSED_WINDOW_TEXT": "crwdns288:0crwdne288:0",
   "IMPORT_WINDOW_TEXT": "crwdns171:0crwdne171:0",
   "IMPORT_WINDOW_FROM_CURL_TEXT": "crwdns172:0crwdne172:0",
   "EXPORT_WINDOW_TEXT": "crwdns173:0crwdne173:0",