monkey-front-core 0.0.44 → 0.0.48

package/fesm2020/monkey-front-core.mjs

@@ -1401,8 +1401,6 @@ function MonkeyEcxCoreService(params) {
         const method = propertyDescriptor.value;
         propertyDescriptor.value = function (...args) {
             const context = this;
-            console.log('context');
-            console.log(context);
             if (hasMonkeyEcxServiceAndHandlingProperties(context)) {
                 context?.monkeyecxService?.monkeyecxHandlingService?.clearAll();
                 context?.monkeyecxService?.monkeyecxHandlingService?.setMonkeyEcxServiceCredentials(params);
@@ -1427,7 +1425,7 @@ function MonkeyEcxCoreServicePaged(params) {
                 context?.monkeyecxService?.monkeyecxHandlingService?.clearAll();
                 context?.monkeyecxService?.monkeyecxHandlingService?.setMonkeyEcxServiceCredentials({
                     ...params,
-                    ...(requestPaged || null)
+                    ...(requestPaged || null),
                 });
             }
             const result = method.apply(context, args);
@@ -1448,7 +1446,7 @@ function MonkeyEcxCoreServiceQueue(name, description, params) {
                 }
                 context?.monkeyecxService.monkeyecxHandlingService.setMonkeyEcxRequestQueue(buildQueuePropertys({
                     name,
-                    description
+                    description,
                 }));
             }
             const result = method.apply(context, args);
@@ -1711,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)
@@ -1723,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;
@@ -1733,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)}`;
     }
@@ -1748,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);
@@ -1840,6 +1846,9 @@ class MonkeyEcxCommonsService {
         return this;
     }
     nextPage() {
+        if (this.__links) {
+            return !!this.__links?.next;
+        }
         if (!this.__requestPaged)
             return false;
         const { page } = this.__requestPaged;
@@ -1861,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) {
@@ -1870,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) {
@@ -2593,8 +2603,8 @@ class MonkeyEcxTokenStorageService {
             programType: '',
             role: '',
             _clearIgnore: {
-                ignore: ['username', 'program']
-            }
+                ignore: ['username', 'program'],
+            },
         };
         this.token$ = new BehaviorSubject(null);
         this.me$ = new BehaviorSubject(null);
@@ -2614,7 +2624,7 @@ class MonkeyEcxTokenStorageService {
     getAllTokens() {
         const { token, config } = this;
         const handledToken = {
-            ...token
+            ...token,
         };
         Object.entries(token || {}).forEach(([key, value]) => {
             handledToken[key] = localStorage.getItem(key);
@@ -2626,12 +2636,12 @@ class MonkeyEcxTokenStorageService {
     }
     setAllMe(me) {
         const { me$ } = this;
-        let previousMe = JSON.parse(localStorage?.getItem('me') || '');
+        let previousMe = JSON.parse(localStorage?.getItem('me') || '{}');
         Object.entries(me).forEach(([key, value]) => {
             if (MonkeyEcxUtils.persistNullEmptyUndefined(value)) {
                 previousMe = {
                     ...previousMe,
-                    [key]: value
+                    [key]: value,
                 };
             }
         });
@@ -2640,7 +2650,7 @@ class MonkeyEcxTokenStorageService {
     }
     getAllMe() {
         const me = localStorage.getItem('me');
-        return JSON.parse(me || '');
+        return JSON.parse(me || '{}');
     }
     tokenHasChanged() {
         return this.token$.asObservable();
@@ -2692,7 +2702,7 @@ MonkeyEcxTokenStorageService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: MonkeyEcxTokenStorageService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: MonkeyEcxConfigService }]; } });