monkey-front-core 0.0.81 → 0.0.85

package/fesm2020/monkey-front-core.mjs

@@ -1797,9 +1797,12 @@ class MonkeyEcxCommonsService {
         this.__onZipCodeDataChanged$ = new BehaviorSubject(null);
         this.__oni18nDataChanged$ = new BehaviorSubject(null);
         this.__onDoSearch$ = new BehaviorSubject({});
-        this.__onDoPagination$ = new BehaviorSubject(null);
         this.__tokenCredentials = null;
         this.__schedule = null;
+        this.callbackPagination = () => {
+            // eslint-disable-next-line no-console
+            return console.error('Method callbackPagination needs to be declared');
+        };
         this.handleInit();
     }
     handleInit() {
@@ -1927,19 +1930,16 @@ class MonkeyEcxCommonsService {
         this.flagValidator = false;
     }
     resolve(route, state, otherArgs) {
-        //this.__data = null;
-        //this.__page = null;
-        //this.__requestPaged = null;
+        if (JSON.stringify(route?.queryParams) === '{}') {
+            this.__data = null;
+            this.__page = null;
+        }
+        this.__requestPaged = null;
         this.flagValidator = true;
         if (this.tokenStorage) {
             this.__tokenCredentials = this.tokenStorage.getToken();
         }
         if (this.allowedSecurityAccess(otherArgs?.security)) {
-            //Object.entries(this).forEach(([key, value]) => {
-            //  if (value instanceof BehaviorSubject) {
-            //    Object.defineProperty(this, key, new BehaviorSubject(null));
-            //  }
-            //});
             if (this.__schedule) {
                 this.otherArgs?.schedule?.service?.removeSchedule(this.__schedule);
                 this.__schedule = null;
@@ -1953,24 +1953,13 @@ class MonkeyEcxCommonsService {
                     },
                 });
             }
-            if (otherArgs?.callbackPagination) {
-                this.__onDoPagination$.subscribe(() => {
-                    if (!this.__onLoadingInProgress$.value) {
-                        const hasMorePages = this.setPage({
-                            page: {
-                                ...this.__page,
-                            },
-                        }).nextPage();
-                        if (hasMorePages && otherArgs?.callbackPagination) {
-                            otherArgs.callbackPagination();
-                        }
-                    }
-                });
-            }
             if (otherArgs?.translateOptions) {
                 const { service, keys } = otherArgs?.translateOptions;
                 this.geti18n(service, keys || '');
             }
+            if (otherArgs?.callbackPagination) {
+                this.callbackPagination = otherArgs.callbackPagination;
+            }
             if (otherArgs?.feature) {
                 const { flag, service } = otherArgs.feature;
                 service.onFlags
@@ -2019,6 +2008,18 @@ class MonkeyEcxCommonsService {
             this.__oni18nDataChanged$.next(null);
         });
     }
+    doPagination() {
+        if (!this.__onLoadingInProgress$.value) {
+            const hasMorePages = this.setPage({
+                page: {
+                    ...this.__page,
+                },
+            }).nextPage();
+            if (hasMorePages && this.callbackPagination) {
+                this.callbackPagination();
+            }
+        }
+    }
 }
 __decorate([
     MonkeyEcxCoreService({
@@ -2661,7 +2662,7 @@ class MonkeyEcxTokenStorageService {
         Object.entries(token || {}).forEach(([key, value]) => {
             handledToken[key] = localStorage.getItem(key);
         });
-        if (config?.program) {
+        if (!handledToken?.program && config?.program) {
             handledToken.program = config?.program?.token;
         }
         return handledToken;