monkey-front-core 0.0.47 → 0.0.48

package/fesm2020/monkey-front-core.mjs

@@ -1709,11 +1709,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
             }] } });
 
 class MonkeyEcxRequestPagedHandling {
-    constructor(_url, _pagedParams) {
+    constructor(_url, _pagedParams, _links) {
         this.url = _url;
         this.pagedParams = _pagedParams || {
-            page: {}
+            page: {},
         };
+        this.links = _links;
     }
     handlePagedValuesFromApi(url = '') {
         if (url.search('\\?') < 0)
@@ -1721,8 +1722,11 @@ class MonkeyEcxRequestPagedHandling {
         const params = url.substring(url.search('\\?') + 1, url.length);
         url = url.substring(0, url.search('\\?'));
         return `${url}?${new HttpParams({
-            fromString: params
-        }).delete('size').delete('page').toString()}`;
+            fromString: params,
+        })
+            .delete('size')
+            .delete('page')
+            .toString()}`;
     }
     getUrlParams(url) {
         const { pagedParams } = this;
@@ -1731,7 +1735,10 @@ class MonkeyEcxRequestPagedHandling {
         return `${!hasInitialQueryParams ? '?' : '&'}page=${number || 0}&size=${size || 20}`;
     }
     getRequestWithPagedParams() {
-        const { url } = this;
+        const { url, links } = this;
+        if (links && links.next) {
+            return links.next.href;
+        }
         const handled = this.handlePagedValuesFromApi(url);
         return `${handled}${this.getUrlParams(handled)}`;
     }
@@ -1746,6 +1753,7 @@ class MonkeyEcxCommonsService {
         this.__error = null;
         this.__handledError = null;
         this.__page = null;
+        this.__links = null;
         this.__requestPaged = null;
         this.__onSearchChanged$ = new BehaviorSubject(null);
         this.__onDataChanged$ = new BehaviorSubject(null);
@@ -1838,6 +1846,9 @@ class MonkeyEcxCommonsService {
         return this;
     }
     nextPage() {
+        if (this.__links) {
+            return !!this.__links?.next;
+        }
         if (!this.__requestPaged)
             return false;
         const { page } = this.__requestPaged;
@@ -1859,8 +1870,8 @@ class MonkeyEcxCommonsService {
         return _embedded ? _embedded[field] : null;
     }
     getNormalizedUrl(url) {
-        const { __requestPaged } = this;
-        return new MonkeyEcxRequestPagedHandling(url, __requestPaged || {}).getRequestWithPagedParams();
+        const { __requestPaged, __links } = this;
+        return new MonkeyEcxRequestPagedHandling(url, __requestPaged || {}, __links).getRequestWithPagedParams();
     }
     clear(clearData) {
         if (clearData) {
@@ -1868,6 +1879,7 @@ class MonkeyEcxCommonsService {
             this.__requestPaged = null;
             this.__params = null;
             this.__page = null;
+            this.__links = null;
             if (this.__schedule) {
                 const { queue } = this.__schedule;
                 if (queue) {