monkey-front-core 0.0.331 → 0.0.332

package/fesm2020/monkey-front-core.mjs

@@ -2889,48 +2889,20 @@ class MonkeyEcxCommonsService {
         this.__handledError = null;
         this.flagValidator = false;
     }
-    async continueResolve(otherArgs) {
+    async resolve(route, state, otherArgs) {
+        if (JSON.stringify(route?.queryParams) === '{}') {
+            this.__data = null;
+            this.__page = null;
+        }
         this.__requestPaged = null;
         this.flagValidator = true;
         if (this.tokenStorage) {
             this.__tokenCredentials = await this.tokenStorage.getToken();
         }
-        if (this.allowedSecurityAccess(otherArgs?.security)) {
-            if (otherArgs?.feature) {
-                const { flag, service } = otherArgs.feature;
-                service.onFlags
-                    .pipe(takeWhile(() => {
-                    return this.flagValidator;
-                }))
-                    .subscribe((val) => {
-                    if (val) {
-                        const hasFlag = service.getFlag(flag);
-                        if (MonkeyEcxUtils.persistNullEmptyUndefined(hasFlag)) {
-                            if (!hasFlag) {
-                                this.navigateToErrorPage(404, otherArgs?.router);
-                                return;
-                            }
-                        }
-                        otherArgs?.callbackMain();
-                    }
-                });
-            }
-            else {
-                otherArgs?.callbackMain();
-            }
-        }
-        else {
-            this.navigateToErrorPage(403, otherArgs?.router);
-        }
-    }
-    resolve(route, state, otherArgs) {
-        if (JSON.stringify(route?.queryParams) === '{}') {
-            this.__data = null;
-            this.__page = null;
-        }
         const pend = this.allowedSecurityAccessByPendency(otherArgs?.pendency);
         const allowedByProgram = this.allowedSecurityAccessByFeature(otherArgs?.featureByProgram);
-        if (this.allowedSecurityAccessByCountry(otherArgs?.countrySecurity) &&
+        if (this.allowedSecurityAccess(otherArgs?.security) &&
+            this.allowedSecurityAccessByCountry(otherArgs?.countrySecurity) &&
             !pend.hasPendencies &&
             allowedByProgram) {
             if (this.__schedule) {
@@ -2957,7 +2929,28 @@ class MonkeyEcxCommonsService {
                 this.__paginationOptions = otherArgs?.paginationOptions;
                 this.handlePaginationOptions();
             }
-            this.continueResolve(otherArgs);
+            if (otherArgs?.feature) {
+                const { flag, service } = otherArgs.feature;
+                service.onFlags
+                    .pipe(takeWhile(() => {
+                    return this.flagValidator;
+                }))
+                    .subscribe((val) => {
+                    if (val) {
+                        const hasFlag = service.getFlag(flag);
+                        if (MonkeyEcxUtils.persistNullEmptyUndefined(hasFlag)) {
+                            if (!hasFlag) {
+                                this.navigateToErrorPage(404, otherArgs?.router);
+                                return;
+                            }
+                        }
+                        otherArgs?.callbackMain();
+                    }
+                });
+            }
+            else {
+                otherArgs?.callbackMain();
+            }
         }
         else if (!allowedByProgram) {
             this.navigateToErrorPage(404, otherArgs?.router);
@@ -2965,6 +2958,9 @@ class MonkeyEcxCommonsService {
         else if (pend.hasPendencies) {
             this.navigateToPendencyPage(pend, otherArgs?.router);
         }
+        else {
+            this.navigateToErrorPage(403, otherArgs?.router);
+        }
     }
     getHTTPHeaderApplicationPDF() {
         return {
@@ -4942,8 +4938,8 @@ class MonkeyEcxDiscoveryParamsService {
         const found = MonkeyEcxUtils.persistNullEmptyUndefined(route) ? route.data[field] : null;
         return found;
     }
-    getDataFromCurrentNavigation(field) {
-        const navigation = this.router.getCurrentNavigation();
+    getDataFromCurrentNavigation(field, router) {
+        const navigation = this.router.getCurrentNavigation() || router?.getCurrentNavigation();
         let state = null;
         if (MonkeyEcxUtils.persistNullEmptyUndefined(navigation)) {
             state = navigation?.extras.state;