bruce-models 1.9.8 → 2.0.0

package/dist/bruce-models.umd.js

@@ -153,7 +153,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -180,7 +184,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(type), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(type),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -225,7 +233,11 @@
                         rej(err);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(id), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(id),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -255,7 +267,11 @@
                         forms: data.Items
                     };
                 });
-                api.Cache.Set(GetListCacheKey(typeId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(typeId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -535,6 +551,20 @@
             }
             return this.Cache.Get(key);
         }
+        SetCacheItem(params) {
+            let { key, value, duration, req } = params;
+            let noCache = req === null || req === void 0 ? void 0 : req.noCache;
+            if (noCache == null) {
+                noCache = exports.Api.DEFAULT_NO_CACHE;
+            }
+            if (noCache) {
+                return;
+            }
+            if (isNaN(duration)) {
+                duration = exports.Api.DEFAULT_CACHE_DURATION;
+            }
+            this.Cache.Set(key, value, duration);
+        }
         GetSessionId() {
             return this.ssid;
         }
@@ -738,7 +768,11 @@
                 const resData = {
                     account: req
                 };
-                api.Cache.Set(GetCacheKey(id), resData, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(id),
+                    value: resData,
+                    req: reqParams
+                });
                 return resData;
             });
         }
@@ -763,7 +797,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(api.GetSessionId()), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(api.GetSessionId()),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -789,7 +827,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(id, appId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(id, appId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -854,7 +896,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetDbRegionListCacheKey(), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetDbRegionListCacheKey(),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -871,25 +917,28 @@
                 this.setBaseUrl();
             }
             setBaseUrl() {
-                const prefix = "https://cam.nextspace";
-                let url;
+                let codeWord = "cam";
+                let url = "https://<CODEWORD>.nextspace";
                 const env = this.env.toUpperCase();
                 switch (env) {
                     case exports.Api.EEnv.DEV:
-                        url = prefix + "-dev.net/";
+                        codeWord = "guardian";
+                        url += "-dev.net/";
                         break;
                     case exports.Api.EEnv.STG:
-                        url = prefix + "-stg.net/";
+                        codeWord = "guardian";
+                        url += "-stg.net/";
                         break;
                     case exports.Api.EEnv.UAT:
-                        url = prefix + "-uat.net/";
+                        url += "-uat.net/";
                         break;
                     case exports.Api.EEnv.PROD:
-                        url = prefix + ".host/";
+                        url += ".host/";
                         break;
                     default:
                         throw ("Specified Environment is not valid. SuppliedEnv=" + env);
                 }
+                url = url.replace("<CODEWORD>", codeWord);
                 this.baseUrl = url;
             }
             GetBaseUrl() {
@@ -1276,25 +1325,28 @@
                 this.setBaseUrl();
             }
             setBaseUrl() {
-                const prefix = "https://idm.nextspace";
-                let url;
+                let codeWord = "idm";
+                let url = "https://<CODEWORD>.nextspace";
                 const env = this.env.toUpperCase();
                 switch (env) {
                     case exports.Api.EEnv.DEV:
-                        url = prefix + "-dev.net/";
+                        codeWord = "guardian";
+                        url += "-dev.net/";
                         break;
                     case exports.Api.EEnv.STG:
-                        url = prefix + "-stg.net/";
+                        codeWord = "guardian";
+                        url += "-stg.net/";
                         break;
                     case exports.Api.EEnv.UAT:
-                        url = prefix + "-uat.net/";
+                        url += "-uat.net/";
                         break;
                     case exports.Api.EEnv.PROD:
-                        url = prefix + ".host/";
+                        url += ".host/";
                         break;
                     default:
-                        throw ("Specified Environment is not valid. SuppliedEnv1=" + env);
+                        throw ("Specified Environment is not valid. SuppliedEnv=" + env);
                 }
+                url = url.replace("<CODEWORD>", codeWord);
                 this.baseUrl = url;
             }
             GetBaseUrl() {
@@ -1705,7 +1757,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -1755,7 +1811,11 @@
                             }
                             res(null);
                         }));
-                        api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                        api.SetCacheItem({
+                            key,
+                            value: prom,
+                            req: reqParams
+                        });
                         reqs.push(prom);
                     }
                 }
@@ -1964,9 +2024,13 @@
                     for (let i = 0; i < entities.length; i++) {
                         const entity = entities[i];
                         const id = entity.Bruce.ID;
-                        api.Cache.Set(GetCacheKey(id), {
-                            entity: entity
-                        }, exports.Api.DEFAULT_CACHE_DURATION);
+                        api.SetCacheItem({
+                            key: GetCacheKey(id),
+                            value: {
+                                entity: entity
+                            },
+                            req: reqParams
+                        });
                     }
                 }
                 return {
@@ -2906,7 +2970,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -2995,7 +3063,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(entityId), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(entityId),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3075,7 +3147,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(entityId), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(entityId),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3140,7 +3216,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(entityId), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(entityId),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3201,7 +3281,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(url), req, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(url),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3242,7 +3326,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetEntityListKey(entityId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetEntityListKey(entityId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -3274,7 +3362,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetTypeListKey(typeId, group), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetTypeListKey(typeId, group),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -3340,7 +3432,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3366,7 +3462,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(id), req);
+                api.SetCacheItem({
+                    key: GetCacheKey(id),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3431,7 +3531,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -3466,7 +3570,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3572,7 +3680,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(entityId, filter), req);
+                api.SetCacheItem({
+                    key: GetListCacheKey(entityId, filter),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3598,7 +3710,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetEntityCacheKey(entityId), prom);
+                api.SetCacheItem({
+                    key: GetEntityCacheKey(entityId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -3794,7 +3910,11 @@
                                 rej(e);
                             }
                         }));
-                        api.Cache.Set(GetCacheKey(id), req, exports.Api.DEFAULT_CACHE_DURATION);
+                        api.SetCacheItem({
+                            key: GetCacheKey(id),
+                            value: req,
+                            req: reqParams
+                        });
                         reqs.push(req);
                     }
                 }
@@ -3822,7 +3942,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(entityTypeId), req, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(entityTypeId),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -3885,7 +4009,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -3920,7 +4048,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), req, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -4031,7 +4163,7 @@
                             cell.Fetched = true;
                             return;
                         }
-
+
                         let [x2, y2] = max;
                         x2 = Math.max(x2, lon2);
                         y2 = Math.max(y2, lat2);
@@ -4354,7 +4486,10 @@
                                     sortOrder: exports.Api.ESortOrder.Asc,
                                     entityTypeConditions: this.attrFilter
                                 },
-                                viaCdn: this.viaCdn
+                                viaCdn: this.viaCdn,
+                                req: {
+                                    noCache: true
+                                }
                             });
                             const integrity = this.getIntegrityId();
                             if (loopIntegrity == integrity && entities) {
@@ -4550,7 +4685,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(entityId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(entityId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -4796,7 +4935,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -5023,7 +5166,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -5046,7 +5193,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), req, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -5145,7 +5296,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(tilesetId, loadFiles), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(tilesetId, loadFiles),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -5199,7 +5354,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), req, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -5434,7 +5593,11 @@
                             rej(e);
                         }
                     }));
-                    api.Cache.Set(GetCacheKey(accountId, tilesetId), prom);
+                    api.SetCacheItem({
+                        key: GetCacheKey(accountId, tilesetId),
+                        value: prom,
+                        req: reqParams
+                    });
                     return prom;
                 });
             }
@@ -5460,7 +5623,11 @@
                             rej(e);
                         }
                     }));
-                    api.Cache.Set(GetCacheKey(accountId), req);
+                    api.SetCacheItem({
+                        key: GetCacheKey(accountId),
+                        value: req,
+                        req: reqParams
+                    });
                     return req;
                 });
             }
@@ -5636,7 +5803,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -5677,7 +5848,11 @@
                                     bookmark: item
                                 });
                             });
-                            api.Cache.Set(GetCacheKey(viewId, item.ID), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                            api.SetCacheItem({
+                                key: GetCacheKey(viewId, item.ID),
+                                value: prom,
+                                req: reqParams
+                            });
                         }
                         res({
                             bookmarks: items
@@ -5687,7 +5862,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(viewId), req, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(viewId),
+                    value: req,
+                    req: reqParams
+                });
                 return req;
             });
         }
@@ -5763,7 +5942,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -5786,7 +5969,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -6105,7 +6292,11 @@
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetListCacheKey(), res, exports.Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetListCacheKey(),
+                value: res,
+                req: reqParams
+            });
             return res;
         }
         Style.GetList = GetList;
@@ -6129,7 +6320,11 @@
                     rej(e);
                 }
             }));
-            api.Cache.Set(GetCacheKey(id), prom, exports.Api.DEFAULT_CACHE_DURATION);
+            api.SetCacheItem({
+                key: GetCacheKey(id),
+                value: prom,
+                req: reqParams
+            });
             return prom;
         }
         Style.Get = Get;
@@ -6208,7 +6403,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(key, prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key,
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -6423,7 +6622,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(id, accountId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(id, accountId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -6499,7 +6702,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetSettingsCacheKey(userId, appId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetSettingsCacheKey(userId, appId),
+                    value: prom,
+                    req: req
+                });
                 return prom;
             });
         }
@@ -6576,7 +6783,11 @@
                             rej(e);
                         }
                     }));
-                    api.Cache.Set(GetEmailCacheKey(email, accountId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                    api.SetCacheItem({
+                        key: GetEmailCacheKey(email, accountId),
+                        value: prom,
+                        req: reqParams
+                    });
                     return prom;
                 });
             }
@@ -6608,13 +6819,21 @@
                     req.then((data) => {
                         const users = data.users;
                         for (let i = 0; i < users.length; i++) {
-                            api.Cache.Set(GetCacheKey(users[i].ID, accountId), {
-                                user: users[i]
+                            api.SetCacheItem({
+                                key: GetCacheKey(users[i].ID, accountId),
+                                value: {
+                                    user: users[i]
+                                },
+                                req: reqParams
                             });
                         }
                     });
                     if (!exclusive) {
-                        api.Cache.Set(GetListCacheKey(accountId), req, exports.Api.DEFAULT_CACHE_DURATION);
+                        api.SetCacheItem({
+                            key: GetListCacheKey(accountId),
+                            value: req,
+                            req: reqParams
+                        });
                     }
                     return req;
                 });
@@ -6762,12 +6981,20 @@
                     req.then((data) => {
                         const users = data.tokens;
                         for (let i = 0; i < users.length; i++) {
-                            api.Cache.Set(GetCacheKey(users[i].ID, accountId), {
-                                user: users[i]
+                            api.SetCacheItem({
+                                key: GetCacheKey(users[i].ID, accountId),
+                                value: {
+                                    user: users[i]
+                                },
+                                req: reqParams
                             });
                         }
                     });
-                    api.Cache.Set(GetListCacheKey(accountId), req, exports.Api.DEFAULT_CACHE_DURATION);
+                    api.SetCacheItem({
+                        key: GetListCacheKey(accountId),
+                        value: req,
+                        req: reqParams
+                    });
                     return req;
                 });
             }
@@ -7061,7 +7288,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(type, pageIndex), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(type, pageIndex),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -7084,7 +7315,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(fileId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(fileId),
+                    value: prom,
+                    req: reqParams
+                });
                 return prom;
             });
         }
@@ -7303,7 +7538,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetCacheKey(pluginId), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetCacheKey(pluginId),
+                    value: prom,
+                    req: req
+                });
                 return prom;
             });
         }
@@ -7326,7 +7565,11 @@
                         rej(e);
                     }
                 }));
-                api.Cache.Set(GetListCacheKey(), prom, exports.Api.DEFAULT_CACHE_DURATION);
+                api.SetCacheItem({
+                    key: GetListCacheKey(),
+                    value: prom,
+                    req: req
+                });
                 return prom;
             });
         }