Merge remote-tracking branch 'atomic-client/master'

atomicjolt · Jan 9, 2017 · e28dd5c · e28dd5c
2 parents 9e58559 + 142310c
commit e28dd5c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/client/js/libs/canvas/middleware.js b/client/js/libs/canvas/middleware.js
@@ -33,20 +33,25 @@ function proxyCanvas(store, action, params) {
     },
     action.body
   ).then((response, error) => {
+    let lastPage = false;
+
     if (action.canvas.method === 'get' && response.header) {
       const nextUrl = getNextUrl(response.headers.link);
       if (nextUrl) {
         const newParams = parseParams(nextUrl);
         if (newParams) {
           proxyCanvas(store, action, newParams);
         }
+      } else {
+        lastPage = true;
       }
     }
 
     store.dispatch({
       type: action.canvas.type + DONE,
       payload: response.body,
       original: action,
+      lastPage,
       response,
       error
     }); // Dispatch the new data

diff --git a/client/js/libs/urls.js b/client/js/libs/urls.js
@@ -7,6 +7,8 @@ export function getNextUrl(link){
     });
     if(url){
       return url.split(';')[0].replace(/[\<\>\s]/g, "");
+    } else {
+      return null;
     }
   }
 }