docs(cookbook/graphql): Fix linting issues and change package to apollo-angular

Urigo · Urigo · commit 453c0ae34614 · 2017-02-02T15:54:51.000-08:00
diff --git a/public/docs/_examples/heroes-graphql/ts/app/app.module.ts b/public/docs/_examples/heroes-graphql/ts/app/app.module.ts
@@ -16,7 +16,7 @@ import { AppRoutingModule } from './app-routing.module';
 
 // #docregion import-apollo
 // ...
-import { ApolloModule } from 'angular2-apollo';
+import { ApolloModule } from 'apollo-angular';
 import { client } from './client';
 // ...
 // #enddocregion import-apollo
diff --git a/public/docs/_examples/heroes-graphql/ts/app/client.1.ts b/public/docs/_examples/heroes-graphql/ts/app/client.1.ts
@@ -2,4 +2,4 @@
 import ApolloClient from 'apollo-client';
 
 export const client = new ApolloClient();
-// #enddocregion default-initialization
+// #enddocregion default-initialization
diff --git a/public/docs/_examples/heroes-graphql/ts/app/client.2.ts b/public/docs/_examples/heroes-graphql/ts/app/client.2.ts
@@ -6,4 +6,4 @@ export const client = new ApolloClient({
     uri: 'http://my-api.graphql.com'
   })
 });
-// #enddocregion network-initialization
+// #enddocregion network-initialization
diff --git a/public/docs/_examples/heroes-graphql/ts/app/client.ts b/public/docs/_examples/heroes-graphql/ts/app/client.ts
@@ -1,12 +1,12 @@
 // #docregion
-import { ApolloClient, createNetworkInterface } from 'apollo-client';
+import { ApolloClient } from 'apollo-client';
 import { networkInterface } from './in-memory-graphql';
 
 const client = new ApolloClient({
   networkInterface,
-  dataIdFromObject: (object:any) => object.id,
+  dataIdFromObject: (object: any) => object.id,
 });
 export {
   client
 }
-// #enddocregion
+// #enddocregion
diff --git a/public/docs/_examples/heroes-graphql/ts/app/dashboard.component.ts b/public/docs/_examples/heroes-graphql/ts/app/dashboard.component.ts
@@ -2,14 +2,10 @@
 import { Component, OnInit } from '@angular/core';
 
 // #docregion import-apollo
-//..
-import { Angular2Apollo, ApolloQueryObservable } from 'angular2-apollo';
-//..
+import { Angular2Apollo } from 'apollo-angular';
 // #enddocregion import-apollo
 // #docregion import-graphql-tag
-//..
 import gql from 'graphql-tag';
-//..
 // #enddocregion import-graphql-tag
 import { ApolloQueryResult } from 'apollo-client';
 import { Hero }              from './hero';
@@ -25,11 +21,8 @@ export class DashboardComponent implements OnInit {
   // #docregion this-heroes
   heroes: Hero[];
   // #enddocregion this-heroes
-  
   // #docregion inject-apollo
-  //..
   constructor(private apollo: Angular2Apollo) { }
-  //..
   // #enddocregion inject-apollo
 
   // #docregion query-heroes
@@ -45,9 +38,9 @@ export class DashboardComponent implements OnInit {
       `,
       forceFetch: true
     }).subscribe((queryResult: ApolloQueryResult) => {
-      this.heroes = queryResult.data.heroes.slice(1, 5)
+      this.heroes = queryResult.data.heroes.slice(1, 5);
     });
   }
   // #enddocregion query-heroes
 }
-// #enddocregion
+// #enddocregion
diff --git a/public/docs/_examples/heroes-graphql/ts/app/hero-detail.component.1.ts b/public/docs/_examples/heroes-graphql/ts/app/hero-detail.component.1.ts
@@ -1,12 +1,10 @@
 // #docregion
-import 'rxjs/add/operator/switchMap';
 import { Component, OnInit }      from '@angular/core';
-import { ActivatedRoute, Params } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { Location }               from '@angular/common';
 
-import {Angular2Apollo, ApolloQueryObservable} from 'angular2-apollo';
-import {Subscription} from 'rxjs/Subscription';
-import {Subject} from 'rxjs/Subject';
+import { Angular2Apollo, ApolloQueryObservable } from 'apollo-angular';
+import { Subscription } from 'rxjs/Subscription';
 import gql from 'graphql-tag';
 
 import { Hero }        from './hero';
@@ -20,8 +18,6 @@ import { Hero }        from './hero';
 export class HeroDetailComponent implements OnInit {
   hero: Hero;
 
-  private heroId: Subject<string> = new Subject<string>();
-
   private heroSubscription: Subscription;
   private heroObservable: ApolloQueryObservable<any>;
 
@@ -50,7 +46,7 @@ export class HeroDetailComponent implements OnInit {
       });
       // #enddocregion graphql-query-new-field
 
-      this.heroSubscription = this.heroObservable.subscribe(({data, loading}) => {
+      this.heroSubscription = this.heroObservable.subscribe(({data}) => {
         this.hero = data.hero;
       });
     });
diff --git a/public/docs/_examples/heroes-graphql/ts/app/hero-detail.component.ts b/public/docs/_examples/heroes-graphql/ts/app/hero-detail.component.ts
@@ -1,12 +1,10 @@
 // #docregion
-import 'rxjs/add/operator/switchMap';
 import { Component, OnInit }      from '@angular/core';
-import { ActivatedRoute, Params } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { Location }               from '@angular/common';
 
-import {Angular2Apollo, ApolloQueryObservable} from 'angular2-apollo';
-import {Subscription} from 'rxjs/Subscription';
-import {Subject} from 'rxjs/Subject';
+import { Angular2Apollo, ApolloQueryObservable } from 'apollo-angular';
+import { Subscription } from 'rxjs/Subscription';
 import gql from 'graphql-tag';
 
 import { Hero }        from './hero';
@@ -21,8 +19,6 @@ import { ApolloQueryResult } from 'apollo-client';
 export class HeroDetailComponent implements OnInit {
   hero: Hero;
 
-  private heroId: Subject<string> = new Subject<string>();
-
   private heroSubscription: Subscription;
   private heroObservable: ApolloQueryObservable<any>;
 
@@ -49,7 +45,7 @@ export class HeroDetailComponent implements OnInit {
         variables: { heroId: heroId }
       });
 
-      this.heroSubscription = this.heroObservable.subscribe(({data, loading}) => {
+      this.heroSubscription = this.heroObservable.subscribe(({data}) => {
         this.hero = data.hero;
       });
       // #enddocregion graphql-query
diff --git a/public/docs/_examples/heroes-graphql/ts/app/hero-search.component.ts b/public/docs/_examples/heroes-graphql/ts/app/hero-search.component.ts
@@ -2,12 +2,11 @@
 // #docregion
 import { Component, OnInit } from '@angular/core';
 import { Router }            from '@angular/router';
-import { Observable }        from 'rxjs/Observable';
 import { Subject }           from 'rxjs/Subject';
 
 import { Hero } from './hero';
 
-import { Angular2Apollo, ApolloQueryObservable } from 'angular2-apollo';
+import { Angular2Apollo, ApolloQueryObservable } from 'apollo-angular';
 import gql from 'graphql-tag';
 
 @Component({
@@ -53,7 +52,7 @@ export class HeroSearchComponent implements OnInit {
           .distinctUntilChanged()   // ignore if next search term is same as previous
       },
       forceFetch: true
-    })
+    });
   }
   // #enddocregion search
 
diff --git a/public/docs/_examples/heroes-graphql/ts/app/heroes.component.1.ts b/public/docs/_examples/heroes-graphql/ts/app/heroes.component.1.ts
@@ -3,14 +3,10 @@ import { Component, OnInit } from '@angular/core';
 import { Router }            from '@angular/router';
 
 // #docregion import-apollo
-//..
-import { Angular2Apollo, ApolloQueryObservable } from 'angular2-apollo';
-//..
+import { Angular2Apollo } from 'apollo-angular';
 // #enddocregion import-apollo
 // #docregion import-graphql-tag
-//..
 import gql from 'graphql-tag';
-//..
 // #enddocregion import-graphql-tag
 import { ApolloQueryResult } from 'apollo-client';
 import { Hero }              from './hero';
@@ -57,12 +53,6 @@ export class HeroesComponent implements OnInit {
 
   // #docregion delete
   delete(hero: Hero): void {
-    // this.heroService
-    //     .delete(hero.id)
-    //     .then(() => {
-    //       this.heroes = this.heroes.filter(h => h !== hero);
-    //       if (this.selectedHero === hero) { this.selectedHero = null; }
-    //     });
   }
   // #enddocregion delete
 
diff --git a/public/docs/_examples/heroes-graphql/ts/app/heroes.component.ts b/public/docs/_examples/heroes-graphql/ts/app/heroes.component.ts
@@ -3,14 +3,10 @@ import { Component, OnInit } from '@angular/core';
 import { Router }            from '@angular/router';
 
 // #docregion import-apollo
-//..
-import { Angular2Apollo, ApolloQueryObservable } from 'angular2-apollo';
-//..
+import { Angular2Apollo } from 'apollo-angular';
 // #enddocregion import-apollo
 // #docregion import-graphql-tag
-//..
 import gql from 'graphql-tag';
-//..
 // #enddocregion import-graphql-tag
 import { ApolloQueryResult } from 'apollo-client';
 import { Hero }              from './hero';
diff --git a/public/docs/_examples/heroes-graphql/ts/app/in-memory-graphql.ts b/public/docs/_examples/heroes-graphql/ts/app/in-memory-graphql.ts
@@ -1,6 +1,6 @@
 // #docregion
 // #docregion import-lodash
-import { find, filter } from 'lodash';
+import { find } from 'lodash';
 // #enddocregion import-lodash
 // #docregion import-graphql-tools
 import { makeExecutableSchema } from 'graphql-tools';
@@ -66,8 +66,8 @@ const resolveFunctions = {
   Query: {
     heroes(obj: any, args: any) {
       if (args.search) {
-        return heroes.filter(function (currentHero) { 
-          return currentHero.name.toLowerCase().search(args.search.toLowerCase()) != -1; 
+        return heroes.filter(function (currentHero){
+          return currentHero.name.toLowerCase().search(args.search.toLowerCase()) !== -1;
         });
       } else {
         return heroes;
@@ -87,7 +87,7 @@ const resolveFunctions = {
       return hero;
     },
     addHero(root: any, args: any) {
-      const maxId = Math.max(...heroes.map((hero)=>{return hero.id}));
+      const maxId = Math.max(...heroes.map((hero) => {return hero.id; }));
       const newHero = {
         name: args.heroName,
         id: maxId + 1
@@ -96,18 +96,15 @@ const resolveFunctions = {
       return newHero;
     },
     deleteHero(root: any, args: any) {
-      console.log('args', args);
       let hero = find(heroes, { id: args.id });
-      console.log('deleted hero start', hero);
       if (!hero) {
         throw new Error(`Couldn't find post with id ${args.id}`);
       }
-      heroes = heroes.filter(function (currentHero) { return currentHero.id != args.id; });
-      console.log('deleted hero', hero);
+      heroes = heroes.filter(function (currentHero) { return currentHero.id !== args.id; });
       return hero;
     },
   }
-}
+};
 // #enddocregion resolvers
 // #docregion make-executable-schema
 const schema = makeExecutableSchema({
@@ -138,4 +135,4 @@ export {
   networkInterface
 }
 // #enddocregion execute-and-export
-// #enddocregion
+// #enddocregion
diff --git a/public/docs/_examples/heroes-graphql/ts/systemjs.config.extras.js b/public/docs/_examples/heroes-graphql/ts/systemjs.config.extras.js
@@ -5,7 +5,7 @@ System.config({
   map: {
     'apollo-client':                      'npm:apollo-client',
     'apollo-client-rxjs':                 'npm:apollo-client-rxjs',
-    'apollo-angular-test':                'npm:apollo-angular-test',
+    'apollo-angular':                     'npm:apollo-angular',
 
     'graphql':                            'npm:graphql',
     'whatwg-fetch':                       'npm:whatwg-fetch',
diff --git a/public/docs/_examples/package.json b/public/docs/_examples/package.json
@@ -25,7 +25,7 @@
     "@angular/tsc-wrapped": "^0.5.0",
     "@angular/upgrade": "~2.4.0",
     "angular-in-memory-web-api": "~0.2.4",
-    "angular2-apollo": "^0.8.0",
+    "apollo-angular": "^0.1.0",
     "apollo-client": "^0.5.8",
     "core-js": "^2.4.1",
     "graphql": "^0.8.2",
