ntk-cms-api 1.2.242 → 1.2.243

package/fesm2020/ntk-cms-api.mjs

@@ -1265,8 +1265,6 @@ class ApiServerBase {
         this.keyBaseUrl = 'baseUrl';
         this.accessLoad = false;
         this.cachApiResult = [];
-        this.cachApiCallDate = [];
-        this.cashApiSeconds = 5000;
         this.childConstructor();
         this.headers = new Map();
     }
@@ -1275,13 +1273,15 @@ class ApiServerBase {
         localStorage.setItem(this.keyBaseUrl, url);
         this.configApiRetry = apiRetry;
     }
-    cashApiIsValid(serviceNameKay) {
-        if (!this.cachApiResult[serviceNameKay])
-            return false;
-        if (!this.cachApiResult[serviceNameKay].isSuccess)
-            return true;
-        if (this.cachApiResult[serviceNameKay].dateResult && (new Date().getTime() - this.cachApiResult[serviceNameKay].dateResult) < this.cashApiSeconds)
-            return true;
+    cashApiIsValid(serviceNameKay, cashApiSeconds) {
+        if (cashApiSeconds > 0) {
+            if (!this.cachApiResult[serviceNameKay])
+                return false;
+            if (!this.cachApiResult[serviceNameKay].isSuccess)
+                return false;
+            if (this.cachApiResult[serviceNameKay].dateResult && (new Date().getTime() - this.cachApiResult[serviceNameKay].dateResult) < cashApiSeconds)
+                return true;
+        }
         return false;
     }
     childConstructor() {
@@ -1297,9 +1297,6 @@ class ApiServerBase {
     getModuleControllerUrl() {
         return 'Empty';
     }
-    getModuleCashService() {
-        return [];
-    }
     setHeaders(key, value) {
         this.headers.set(key, value);
     }
@@ -1683,22 +1680,11 @@ class ApiCmsServerBase extends ApiServerBase {
             return this.errorExceptionResultCheck(ret);
         }));
     }
-    ServiceGetOneById(id) {
+    ServiceGetOneById(id, cashApiSeconds) {
         //! optimaze call api
-        const serviceName = 'ServiceGetOneById';
-        const serviceNameKay = serviceName + '_' + id;
-        if (this.getModuleCashService().includes(serviceName)) {
-            if (this.cashApiIsValid(serviceNameKay))
-                return of(this.cachApiResult[serviceNameKay]);
-            if (this.cachApiCallDate[serviceNameKay]) {
-                const startDate = new Date();
-                while ((new Date().getTime() - startDate.getTime()) < this.cashApiSeconds) {
-                    if (this.cashApiIsValid(serviceNameKay))
-                        return of(this.cachApiResult[serviceNameKay]);
-                }
-            }
-            this.cachApiCallDate[serviceNameKay] = true;
-        }
+        const serviceNameKay = 'ServiceGetOneById' + '_' + id;
+        if (this.cashApiIsValid(serviceNameKay, cashApiSeconds))
+            return of(this.cachApiResult[serviceNameKay]);
         //! optimaze call api
         // this.loadingStatus=true;
         return this.http
@@ -1709,10 +1695,9 @@ class ApiCmsServerBase extends ApiServerBase {
         // catchError(this.handleError)
         map((ret) => {
             //! optimaze call api
-            if (this.getModuleCashService().includes(serviceName)) {
+            if (cashApiSeconds > 0) {
                 this.cachApiResult[serviceNameKay] = ret;
                 this.cachApiResult[serviceNameKay].dateResult = new Date();
-                this.cachApiCallDate[serviceNameKay] = false;
             }
             //! optimaze call api
             return this.errorExceptionResultCheck(ret);
@@ -2157,25 +2142,11 @@ class CoreEnumService extends ApiServerBase {
     getModuleControllerUrl() {
         return 'CoreEnum';
     }
-    getModuleCashService() {
-        return ['ServiceRecordStatusEnum'];
-    }
-    ServiceRecordStatusEnum() {
+    ServiceRecordStatusEnum(cashApiSeconds) {
         //! optimaze call api
-        const serviceName = 'ServiceRecordStatusEnum';
-        const serviceNameKay = serviceName;
-        if (this.getModuleCashService().includes(serviceName)) {
-            if (this.cashApiIsValid(serviceNameKay))
-                return of(this.cachApiResult[serviceNameKay]);
-            if (this.cachApiCallDate[serviceNameKay]) {
-                const startDate = new Date();
-                while ((new Date().getTime() - startDate.getTime()) < this.cashApiSeconds) {
-                    if (this.cashApiIsValid(serviceNameKay))
-                        return of(this.cachApiResult[serviceNameKay]);
-                }
-            }
-            this.cachApiCallDate[serviceNameKay] = true;
-        }
+        const serviceNameKay = 'ServiceRecordStatusEnum';
+        if (this.cashApiIsValid(serviceNameKay, cashApiSeconds))
+            return of(this.cachApiResult[serviceNameKay]);
         //! optimaze call api
         return this.http
             .get(this.getBaseUrl() + this.getModuleControllerUrl() + '/RecordStatusEnum', {
@@ -2185,10 +2156,9 @@ class CoreEnumService extends ApiServerBase {
         // catchError(this.handleError)
         map((ret) => {
             //! optimaze call api
-            if (this.getModuleCashService().includes(serviceName)) {
+            if (cashApiSeconds > 0) {
                 this.cachApiResult[serviceNameKay] = ret;
                 this.cachApiResult[serviceNameKay].dateResult = new Date();
-                this.cachApiCallDate[serviceNameKay] = false;
             }
             //! optimaze call api
             return this.errorExceptionResultCheck(ret);
@@ -2813,9 +2783,6 @@ class CoreSiteService extends ApiCmsServerBase {
     getModuleControllerUrl() {
         return 'CoreSite';
     }
-    getModuleCashService() {
-        return ['ServiceGetOneById'];
-    }
     ServiceModuleDataOptimaze(linkSiteId) {
         return this.http
             .get(this.getBaseUrl() + this.getModuleControllerUrl() + '/DataOptimaze/' + linkSiteId, {
@@ -3076,9 +3043,6 @@ class CoreUserService extends ApiCmsServerBase {
     getModuleControllerUrl() {
         return 'CoreUser';
     }
-    getModuleCashService() {
-        return ['ServiceGetOneById'];
-    }
     ServiceGetRessellerChart(linkUserId) {
         return this.http
             .get(this.getBaseUrl() + this.getModuleControllerUrl() + '/GetRessellerChart/' + linkUserId, {