From d552c1ee7cdcc991b7a96093d68e6cd8615ad502 Mon Sep 17 00:00:00 2001
From: Kamil Kisiela <kamil.kisiela@ster-project.pl>
Date: Fri, 15 Jul 2016 18:14:45 +0200
Subject: [PATCH] feat(Apollo): loading state from the ApolloQueryResult

backwards compatible
---
 CHANGELOG.md                          | 1 +
 examples/hello-world/client/main.html | 4 +++-
 src/apolloDecorator.ts                | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9c72452a..b20c6a496 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Added `fetchMore` support ([PR #58](https://github.com/apollostack/angular2-apollo/pull/58))
 - Exposed `ApolloQueryObservable` in the index module ([PR #54](https://github.com/apollostack/angular2-apollo/pull/54))
+- Added support for getting `loading` state from ApolloQueryResult [Issue #36](https://github.com/apollostack/angular2-apollo/issues/36) ([PR #43](https://github.com/apollostack/angular2-apollo/pull/43))
 
 ### v0.4.1
 
diff --git a/examples/hello-world/client/main.html b/examples/hello-world/client/main.html
index ddb266651..28628042a 100644
--- a/examples/hello-world/client/main.html
+++ b/examples/hello-world/client/main.html
@@ -9,7 +9,9 @@ <h2>List</h2>
 
 <input type="search" placeholder="Type name..." [(ngModel)]="nameFilter" />
 
-<ul>
+<div *ngIf="data.loading">loading ...</div>
+
+<ul *ngIf="!data.loading">
   <li *ngFor="let user of data.users">
     {{ user.firstName }} {{ user.lastName }}
   </li>
diff --git a/src/apolloDecorator.ts b/src/apolloDecorator.ts
index 879032166..a491989c3 100644
--- a/src/apolloDecorator.ts
+++ b/src/apolloDecorator.ts
@@ -189,12 +189,13 @@ class ApolloHandle {
       loading: true,
     };
 
-    const setQuery = ({ errors, data = {} }: any) => {
+    const setQuery = ({ errors, loading, data = {} }: any) => {
       const changed = this.hasDataChanged(queryName, data);
 
       assign(this.component[queryName], {
         errors,
-        loading: false,
+        // XXX backwards compatibility of loading property
+        loading: !!loading,
         unsubscribe: () => this.getQuerySub(queryName).unsubscribe(),
         refetch: (...args) => this.backcompat(queryName, 'refetch', args),
         stopPolling: () => this.backcompat(queryName, 'stopPolling'),