ntk-cms-api 20.25.54 → 20.25.55

package/fesm2022/ntk-cms-api.mjs

@@ -2,8 +2,8 @@ import * as i1 from '@angular/common/http';
 import { HttpClient } from '@angular/common/http';
 import * as i0 from '@angular/core';
 import { Inject, Injectable } from '@angular/core';
-import { throwError, of, BehaviorSubject } from 'rxjs';
-import { retry, map } from 'rxjs/operators';
+import { throwError, from, of, BehaviorSubject } from 'rxjs';
+import { retry, map, mergeMap } from 'rxjs/operators';
 
 class AccessHelper {
     AccessFieldsSet(access) {
@@ -1118,15 +1118,15 @@ class ApiServerBase {
     get Ver() {
         return localStorage.getItem(this.keyBaseVer) + '_';
     }
-    cashApiIsValid(serviceNameKay, cashApiSeconds = 0, runApiSeconds = 1000) {
+    async cashApiIsValid(serviceNameKay, cashApiSeconds = 0, runApiSeconds = 1000) {
         if (cashApiSeconds <= 0)
             return false;
-        //**cashApiSeconds */
+        // wait asynchronously while another call is in-flight within the allowed window
         while (this.cachApiInRunResult[serviceNameKay] &&
             new Date().getTime() -
                 this.cachApiInRunResult[serviceNameKay]?.getTime() <
                 runApiSeconds) {
-            /*        this.delay(1000).;*/
+            await this.delay(50);
         }
         if (this.cachApiResult[serviceNameKay]?.isSuccess === true &&
             this.cachApiResult[serviceNameKay]?.dateResult &&
@@ -1267,6 +1267,9 @@ class ApiServerBase {
         }
         return throwError(errorMessage);
     }
+    delay(ms) {
+        return new Promise((resolve) => setTimeout(resolve, ms));
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: ApiServerBase, deps: [{ token: HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.7", ngImport: i0, type: ApiServerBase }); }
 }
@@ -1523,21 +1526,23 @@ class ApiCmsServerBase extends ApiServerBase {
     ServiceGetOneById(id, cashApiSeconds = 0) {
         //! optimaze call api
         const serviceNameKay = this.constructor.name + '_ServiceGetOneById_' + id;
-        if (this.cashApiIsValid(serviceNameKay, cashApiSeconds))
-            return of(this.cachApiResult[serviceNameKay]);
-        //! optimaze call api
-        // this.loadingStatus=true;
-        return this.http
-            .get(this.getBaseUrl() + this.getModuleControllerUrl() + '/' + id, {
-            headers: this.getHeaders(),
-        })
-            .pipe(retry(this.configApiRetry), map((ret) => {
+        return from(this.cashApiIsValid(serviceNameKay, cashApiSeconds)).pipe(mergeMap((isValid) => {
+            if (isValid)
+                return of(this.cachApiResult[serviceNameKay]);
             //! optimaze call api
-            if (cashApiSeconds > 0) {
-                this.cashApiVlaueSet(serviceNameKay, ret);
-            }
-            //! optimaze call api
-            return ret;
+            // this.loadingStatus=true;
+            return this.http
+                .get(this.getBaseUrl() + this.getModuleControllerUrl() + '/' + id, {
+                headers: this.getHeaders(),
+            })
+                .pipe(retry(this.configApiRetry), map((ret) => {
+                //! optimaze call api
+                if (cashApiSeconds > 0) {
+                    this.cashApiVlaueSet(serviceNameKay, ret);
+                }
+                //! optimaze call api
+                return ret;
+            }));
         }));
     }
     ServiceGetCount(model) {
@@ -1944,41 +1949,45 @@ class CoreEnumService extends ApiServerBase {
     ServiceRecordStatusEnum(cashApiSeconds = 0) {
         //! optimaze call api
         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', {
-            headers: this.getHeaders(),
-        })
-            .pipe(map((ret) => {
-            //! optimaze call api
-            if (cashApiSeconds > 0) {
-                this.cashApiVlaueSet(serviceNameKay, ret);
-            }
-            //! optimaze call api
-            return ret;
+        return from(this.cashApiIsValid(serviceNameKay, cashApiSeconds)).pipe(mergeMap((isValid) => {
+            if (isValid)
+                return of(this.cachApiResult[serviceNameKay]);
+            return this.http
+                .get(this.getBaseUrl() +
+                this.getModuleControllerUrl() +
+                '/RecordStatusEnum', {
+                headers: this.getHeaders(),
+            })
+                .pipe(map((ret) => {
+                //! optimaze call api
+                if (cashApiSeconds > 0) {
+                    this.cashApiVlaueSet(serviceNameKay, ret);
+                }
+                //! optimaze call api
+                return ret;
+            }));
         }));
     }
     ServiceRecordAdminStatusEnum(cashApiSeconds = 0) {
         //! optimaze call api
         const serviceNameKay = 'ServiceRecordAdminStatusEnum';
-        if (this.cashApiIsValid(serviceNameKay, cashApiSeconds))
-            return of(this.cachApiResult[serviceNameKay]);
-        //! optimaze call api
-        return this.http
-            .get(this.getBaseUrl() +
-            this.getModuleControllerUrl() +
-            '/RecordAdminStatusEnum', {
-            headers: this.getHeaders(),
-        })
-            .pipe(map((ret) => {
-            //! optimaze call api
-            if (cashApiSeconds > 0) {
-                this.cashApiVlaueSet(serviceNameKay, ret);
-            }
-            //! optimaze call api
-            return ret;
+        return from(this.cashApiIsValid(serviceNameKay, cashApiSeconds)).pipe(mergeMap((isValid) => {
+            if (isValid)
+                return of(this.cachApiResult[serviceNameKay]);
+            return this.http
+                .get(this.getBaseUrl() +
+                this.getModuleControllerUrl() +
+                '/RecordAdminStatusEnum', {
+                headers: this.getHeaders(),
+            })
+                .pipe(map((ret) => {
+                //! optimaze call api
+                if (cashApiSeconds > 0) {
+                    this.cashApiVlaueSet(serviceNameKay, ret);
+                }
+                //! optimaze call api
+                return ret;
+            }));
         }));
     }
     ServiceLocationTypeEnum() {