Updated rxjs, codemirror, core-js, graphql, zone.js and other libraries.

package.json

@@ -58,30 +58,30 @@
     "clarity-angular": "^0.10.13",
     "clarity-icons": "^0.10.13",
     "clarity-ui": "^0.10.13",
-    "codemirror": "^5.25.0",
+    "codemirror": "^5.33.0",
     "codemirror-graphql": "^0.6.11",
     "cookie-parser": "^1.4.3",
-    "core-js": "^2.4.1",
+    "core-js": "^2.5.3",
     "electron-compile": "^6.4.1",
     "electron-is-dev": "^0.3.0",
     "electron-log": "^2.2.11",
     "electron-squirrel-startup": "^1.0.0",
     "electron-updater": "^2.16.1",
-    "express": "^4.15.2",
-    "graphql": "^0.10.5",
+    "express": "^4.16.2",
+    "graphql": "^0.12.3",
     "graphql-query-compress": "^0.9.6",
-    "marked": "^0.3.6",
-    "ng2-codemirror": "^1.1.2",
+    "marked": "^0.3.12",
+    "ng2-codemirror": "^1.1.3",
     "ng2-completer": "^1.6.3",
     "ng2-toastr": "^4.1.2",
-    "ngrx-store-localstorage": "^0.1.8",
+    "ngrx-store-localstorage": "^0.3.0",
     "ngx-electron": "1.0.3",
-    "rxjs": "^5.4.2",
-    "subscriptions-transport-ws": "^0.9.1",
+    "rxjs": "^5.5.6",
+    "subscriptions-transport-ws": "^0.9.5",
     "to-snake-case": "^1.0.0",
-    "uuid": "^3.0.1",
+    "uuid": "^3.1.0",
     "valid-url": "^1.0.9",
-    "zone.js": "^0.8.4"
+    "zone.js": "^0.8.20"
   },
   "devDependencies": {
     "@types/electron": "^1.4.38",

src/app/actions/gql-schema/gql-schema.ts

@@ -29,3 +29,5 @@ export class SetAllowIntrospectionAction implements Action {
 
     constructor(public payload: any, public windowId: string) {}
 }
+
+export type Action = SetIntrospectionAction | SetIntrospectionFromDbAction | SetSchemaAction | SetAllowIntrospectionAction;

src/app/actions/index.ts

@@ -0,0 +1,4 @@
+import { Action as queryAction } from './query/query';
+import { Action as gqlSchemaAction } from './gql-schema/gql-schema';
+
+export type Action = queryAction | gqlSchemaAction;

src/app/app.module.ts

@@ -39,7 +39,7 @@ export function createTranslateLoader(http: HttpClient) {
 }
 
 export function mapValuesToArray(obj: any): Array<any> {
-    return Object.keys(obj).map(function(key){
+    return Object.keys(obj).map(function(key) {
         return obj[key];
     });
 };

src/app/effects/query.ts

@@ -8,6 +8,7 @@ import * as validUrl from 'valid-url';
 import { GqlService, QueryService, NotifyService, DbService } from '../services';
 import * as fromRoot from '../reducers';
 
+import { Action as allActions } from '../actions';
 import * as queryActions from '../actions/query/query';
 import * as layoutActions from '../actions/layout/layout';
 import * as gqlSchemaActions from '../actions/gql-schema/gql-schema';
@@ -156,7 +157,7 @@ export class QueryEffects {
       });
 
     @Effect()
-    getIntrospectionForUrl$: Observable<queryActions.Action> = this.actions$
+    getIntrospectionForUrl$: Observable<allActions> = this.actions$
       .ofType(queryActions.SEND_INTROSPECTION_QUERY_REQUEST)
       .withLatestFrom(this.store, (action: queryActions.Action, state) => {
         return { data: state.windows[action.windowId], windowId: action.windowId, action };
@@ -192,7 +193,7 @@ export class QueryEffects {
           })
           .map(introspectionData => {
             if (!introspectionData) {
-                return Observable.empty();
+                return null;
             }
 
             this.store.dispatch(new gqlSchemaActions.SetAllowIntrospectionAction(true, res.windowId));

src/app/reducers/windows.ts

@@ -32,10 +32,10 @@ export function windows(reducer: ActionReducer<any>) {
 
                 return _state;
             case windowsActions.SET_WINDOWS:
-                const windows = action.payload;
+                const _windows = action.payload;
 
                 const newWindowsState = {};
-                windows.forEach(window => {
+                _windows.forEach(window => {
                     const windowKey = window.windowId;
                     const windowTitle = window.title;
 
@@ -44,7 +44,7 @@ export function windows(reducer: ActionReducer<any>) {
                     _windowState.windowId = windowKey;
                     _windowState.layout.title = _windowState.layout.title || windowTitle;
 
-                    newWindowsState[windowKey] = Object.assign({}, _windowState);
+                    newWindowsState[windowKey] = { ..._windowState };
                 });
 
                 return newWindowsState;

src/app/services/gql.service.ts

@@ -3,9 +3,8 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 
 import { SubscriptionClient } from 'subscriptions-transport-ws';
-import { buildClientSchema, parse, print } from 'graphql';
+import { buildClientSchema, parse, print, GraphQLSchema } from 'graphql';
 import * as compress from 'graphql-query-compress'; // Somehow this is the way to use this
-import { GraphQLSchema } from 'graphql/type';
 import { introspectionQuery } from './instrospectionQuery';
 
 // Import Rx to get all the operators loaded into the file

src/scss/_framework.scss

@@ -64,6 +64,7 @@
 
 
 /* Clarity - Begin Part 2 */
+@import "node_modules/clarity-ui/src/utils/maps.clarity";
 
 //Reboot
 @import "node_modules/clarity-ui/src/utils/reboot.clarity"; // depends on variables.clarity, mixins.clarity, color.clarity, helpers.clarity
@@ -198,6 +199,7 @@
 @import "node_modules/clarity-ui/src/popover/signpost/signposts.clarity";
 
 
+
 // === *** OVERRIDES *** ===
 .header .branding {
   min-width: 75px;

src/scss/_layout.scss

@@ -36,7 +36,7 @@ app-window {
     border-top: none;
   }
   .nav-trigger-icon {
-    margin-right: 0.8rem;
+    margin-right: 0.2rem;
   }
   .nav-divider {
     border-color: $light-grey;