@koalarx/ui 13.2.5 → 13.2.8

package/core/fesm2020/koalarx-ui-core.mjs

@@ -15,7 +15,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import * as i2$1 from '@angular/router';
 import { NavigationError, NavigationEnd, NavigationCancel, NavigationStart, RouterModule } from '@angular/router';
 import * as i7 from '@angular/material/core';
-import { BehaviorSubject, interval, Observable } from 'rxjs';
+import { BehaviorSubject, interval, Observable, skipWhile } from 'rxjs';
 import jwt from 'jwt-decode';
 import * as i4 from '@koalarx/ui/menu';
 import { menuStateSubject } from '@koalarx/ui/menu';
@@ -1244,20 +1244,38 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
         }], ctorParameters: function () { return [{ type: i1$2.HttpClient }, { type: KoalaOAuth2Service }]; } });
 
 class KoalaApiRequesterCache {
-    static setInCache(cache) {
-        const index = koala(this.cache).array().getIndex('name', cache.name);
-        if (index >= 0) {
-            this.cache[index] = cache;
-        }
-        else {
-            this.cache.push(cache);
+    static createCache(name) {
+        if (!this.hasCache(name)) {
+            this.cache.push({
+                name,
+                data: new BehaviorSubject(undefined)
+            });
         }
     }
-    static getCache(name) {
+    static setDataInCache(name, data) {
+        this.getCacheSubject(name)?.next(data);
+    }
+    static getCacheSubject(name) {
         return this.cache.find(item => item.name === name)?.data;
     }
+    static getCacheAsObservable(name) {
+        return new Observable(observe => {
+            this.getCacheSubject(name)
+                .pipe(skipWhile(value => value === undefined))
+                .subscribe({
+                next: value => {
+                    observe.next(value);
+                    observe.complete();
+                },
+                error: err => {
+                    observe.error(err);
+                    observe.complete();
+                }
+            });
+        });
+    }
     static hasCache(name) {
-        return !!this.getCache(name);
+        return !!this.getCacheSubject(name);
     }
 }
 KoalaApiRequesterCache.cache = [];
@@ -1322,23 +1340,18 @@ class KoalaApiRequesterBase {
         return filter ?? null;
     }
     request(method, url, data = {}) {
-        this.startCache(url);
+        if (this.enableCache && KoalaApiRequesterCache.hasCache(url)) {
+            return KoalaApiRequesterCache.getCacheAsObservable(url);
+        }
+        KoalaApiRequesterCache.createCache(url);
         return this.koalaService
             .request(method, url, data)
             .pipe(map(response => {
             if (this.enableCache)
-                KoalaApiRequesterCache.setInCache({ name: url, data: response });
+                KoalaApiRequesterCache.setDataInCache(url, response);
             return response;
         }));
     }
-    startCache(endpoint) {
-        if (this.enableCache && KoalaApiRequesterCache.hasCache(endpoint)) {
-            return new Observable(observe => {
-                observe.next(KoalaApiRequesterCache.getCache(endpoint));
-                observe.complete();
-            });
-        }
-    }
 }
 
 class KoalaRequestService {
@@ -1436,5 +1449,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { KOALA_LOADER_SUBJECT, KoalaApiRequesterBase, KoalaApiRequesterService, KoalaClientError, KoalaEnvironment, KoalaErrorsHelper, KoalaLanguageHelper, KoalaLoaderService, KoalaNotFoundError, KoalaOAuth2Service, KoalaOauthConfig, KoalaPageModule, KoalaParameterHashLocationStrategy, KoalaRequestHeaderHelper, KoalaRequestService, KoalaResponseFactory, KoalaSuccessError, KoalaTokenService, KoalaUnhautorizedError, LoaderBarPageComponent, NgxKoalaModule, NotificationComponent, PageComponent };
+export { KOALA_LOADER_SUBJECT, KoalaApiRequesterBase, KoalaApiRequesterCache, KoalaApiRequesterService, KoalaClientError, KoalaEnvironment, KoalaErrorsHelper, KoalaLanguageHelper, KoalaLoaderService, KoalaNotFoundError, KoalaOAuth2Service, KoalaOauthConfig, KoalaPageModule, KoalaParameterHashLocationStrategy, KoalaRequestHeaderHelper, KoalaRequestService, KoalaResponseFactory, KoalaSuccessError, KoalaTokenService, KoalaUnhautorizedError, LoaderBarPageComponent, NgxKoalaModule, NotificationComponent, PageComponent };
 //# sourceMappingURL=koalarx-ui-core.mjs.map