From 8ca2609e430a3b36807deb095fce4bc3e247b9fd Mon Sep 17 00:00:00 2001
From: Vito <vito.albano@alfresco.com>
Date: Wed, 26 Jul 2017 08:03:55 -0700
Subject: [PATCH] Added node pagination to SiteModel (#2136)

---
 .../ng2-alfresco-core/src/models/site.model.ts      |  4 ++++
 .../src/services/sites-api.service.ts               | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ng2-components/ng2-alfresco-core/src/models/site.model.ts b/ng2-components/ng2-alfresco-core/src/models/site.model.ts
index 1bdc95a813..1ca5838b0b 100644
--- a/ng2-components/ng2-alfresco-core/src/models/site.model.ts
+++ b/ng2-components/ng2-alfresco-core/src/models/site.model.ts
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import { Pagination } from 'alfresco-js-api';
+
 export class SiteModel {
     role: string;
     visibility: string;
@@ -25,6 +27,7 @@ export class SiteModel {
     title: string;
     contents: SiteContentsModel[] = [];
     members: SiteMembersModel[] = [];
+    pagination: Pagination;
 
     constructor(obj?: any) {
         if (obj && obj.entry) {
@@ -35,6 +38,7 @@ export class SiteModel {
             this.id = obj.entry.id || null;
             this.preset = obj.entry.preset;
             this.title = obj.entry.title;
+            this.pagination = obj.pagination || null;
 
             if (obj.relations && obj.relations.containers) {
                 obj.relations.containers.list.entries.forEach((content) => {
diff --git a/ng2-components/ng2-alfresco-core/src/services/sites-api.service.ts b/ng2-components/ng2-alfresco-core/src/services/sites-api.service.ts
index 7fc8405b0a..f6e9fe99f3 100644
--- a/ng2-components/ng2-alfresco-core/src/services/sites-api.service.ts
+++ b/ng2-components/ng2-alfresco-core/src/services/sites-api.service.ts
@@ -37,8 +37,7 @@ export class SitesApiService {
         };
         const queryOptions = Object.assign({}, defaultOptions, opts);
         return Observable.fromPromise(this.apiService.getInstance().core.sitesApi.getSites(queryOptions))
-            .map((res: any) => res.list.entries)
-            .map((objList) => this.convertToModel(objList))
+            .map((res) => this.convertToModel(res))
             .catch(this.handleError);
     }
 
@@ -68,10 +67,14 @@ export class SitesApiService {
         return Observable.throw(error || 'Server error');
     }
 
-    private convertToModel(objList: any[]) {
+    private convertToModel(response: any) {
         let convertedList: SiteModel[] = [];
-        if (objList && objList.length > 0) {
-            objList.forEach((element: any) => {
+        if (response &&
+            response.list &&
+            response.list.entries &&
+            response.list.entries.length > 0) {
+            response.list.entries.forEach((element: any) => {
+                element.pagination = response.list.pagination;
                 convertedList.push(new SiteModel(element));
             });
         }