ntk-cms-api 20.25.42 → 20.25.44

package/fesm2022/ntk-cms-api.mjs

@@ -1148,6 +1148,7 @@ class ApiServerBase {
         this.keyBaseVer = 'Ver';
         this.accessLoad = false;
         this.cachApiResult = [];
+        this.apiCallStatusInRunResult = [];
         this.childConstructor();
         this.headers = new Map();
     }
@@ -1160,17 +1161,30 @@ class ApiServerBase {
     get Ver() {
         return localStorage.getItem(this.keyBaseVer) + '_';
     }
-    cashApiIsValid(serviceNameKay, cashApiSeconds = 0) {
+    async cashApiIsValid(serviceNameKay, cashApiSeconds = 0) {
         if (cashApiSeconds > 0) {
+            while (this.apiCallStatusInRunResult[serviceNameKay]?.getTime() >
+                new Date().getTime() - 10000) {
+                await new Promise((resolve) => setTimeout(resolve, 100));
+            }
             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)
+            if (this.cachApiResult[serviceNameKay].dateResult &&
+                new Date().getTime() - this.cachApiResult[serviceNameKay].dateResult <
+                    cashApiSeconds)
                 return true;
+            this.apiCallStatusInRunResult[serviceNameKay] = new Date();
         }
         return false;
     }
+    async cashApiVlaueSet(serviceNameKay, ret) {
+        this.cachApiResult[serviceNameKay] = ret;
+        this.cachApiResult[serviceNameKay].dateResult = new Date();
+        this.apiCallStatusInRunResult[serviceNameKay] = undefined;
+        delete this.apiCallStatusInRunResult[serviceNameKay];
+    }
     childConstructor() {
         // test
     }
@@ -1547,7 +1561,7 @@ class ApiCmsServerBase extends ApiServerBase {
             return ret;
         }));
     }
-    ServiceGetOneById(id, cashApiSeconds = 0) {
+    async ServiceGetOneById(id, cashApiSeconds = 0) {
         //! optimaze call api
         const serviceNameKay = this.constructor.name + '_ServiceGetOneById_' + id;
         if (this.cashApiIsValid(serviceNameKay, cashApiSeconds))
@@ -1561,8 +1575,7 @@ class ApiCmsServerBase extends ApiServerBase {
             .pipe(retry(this.configApiRetry), map((ret) => {
             //! optimaze call api
             if (cashApiSeconds > 0) {
-                this.cachApiResult[serviceNameKay] = ret;
-                this.cachApiResult[serviceNameKay].dateResult = new Date();
+                this.cashApiVlaueSet(serviceNameKay, ret);
             }
             //! optimaze call api
             return ret;
@@ -1582,7 +1595,7 @@ class ApiCmsServerBase extends ApiServerBase {
         return this.http
             .get(this.getBaseUrl() +
             this.getModuleControllerUrl() +
-            '/SetStatus/' +
+            '/SetRecordStatus/' +
             id +
             '/' +
             recordStatus, {
@@ -1592,6 +1605,21 @@ class ApiCmsServerBase extends ApiServerBase {
             return ret;
         }));
     }
+    ServiceSetAdminStatus(id, recordAdminStatus) {
+        // this.loadingStatus=true;
+        return this.http
+            .get(this.getBaseUrl() +
+            this.getModuleControllerUrl() +
+            '/SetRecordAdminStatus/' +
+            id +
+            '/' +
+            recordAdminStatus, {
+            headers: this.getHeaders(),
+        })
+            .pipe(retry(this.configApiRetry), map((ret) => {
+            return ret;
+        }));
+    }
     ServiceGetExist(model) {
         return this.http
             .post(this.getBaseUrl() + this.getModuleControllerUrl() + '/exist', model, {
@@ -1967,8 +1995,7 @@ class CoreEnumService extends ApiServerBase {
             .pipe(map((ret) => {
             //! optimaze call api
             if (cashApiSeconds > 0) {
-                this.cachApiResult[serviceNameKay] = ret;
-                this.cachApiResult[serviceNameKay].dateResult = new Date();
+                this.cashApiVlaueSet(serviceNameKay, ret);
             }
             //! optimaze call api
             return ret;
@@ -1981,14 +2008,15 @@ class CoreEnumService extends ApiServerBase {
             return of(this.cachApiResult[serviceNameKay]);
         //! optimaze call api
         return this.http
-            .get(this.getBaseUrl() + this.getModuleControllerUrl() + '/RecordAdminStatusEnum', {
+            .get(this.getBaseUrl() +
+            this.getModuleControllerUrl() +
+            '/RecordAdminStatusEnum', {
             headers: this.getHeaders(),
         })
             .pipe(map((ret) => {
             //! optimaze call api
             if (cashApiSeconds > 0) {
-                this.cachApiResult[serviceNameKay] = ret;
-                this.cachApiResult[serviceNameKay].dateResult = new Date();
+                this.cashApiVlaueSet(serviceNameKay, ret);
             }
             //! optimaze call api
             return ret;