bruce-models 4.9.7 → 4.9.9

package/dist/bruce-models.umd.js

@@ -373,7 +373,7 @@
             if (noCache) {
                 return;
             }
-            if (isNaN(duration)) {
+            if (isNaN(duration) || duration == null) {
                 duration = exports.Api.DEFAULT_CACHE_DURATION;
             }
             this.Cache.Set({
@@ -1384,6 +1384,15 @@
             this.env = (params === null || params === void 0 ? void 0 : params.env) ? params.env : exports.Api.EEnv.PROD;
             this.sessionId = params === null || params === void 0 ? void 0 : params.sessionId;
         }
+        prepEnv(_env) {
+            if (!_env) {
+                _env = this.env;
+            }
+            if (!_env) {
+                _env = exports.Api.EEnv.PROD;
+            }
+            return _env.toUpperCase();
+        }
         /**
          * Clears all cache items in all API instances.
          */
@@ -1474,7 +1483,7 @@
             }
             let { accountId, env, loadConfig, loadWebSocket } = params;
             accountId = accountId ? accountId : this.accountId;
-            env = env ? env : this.env;
+            env = this.prepEnv(env);
             const key = `${accountId}-${env}`;
             if (!this.bruce[key]) {
                 this.bruce[key] = new exports.BruceApi.Api({
@@ -1518,7 +1527,7 @@
                 params = {};
             }
             let { env } = params;
-            env = env ? env : this.env;
+            env = this.prepEnv(env);
             const key = `${env}`;
             if (!this.global[key]) {
                 this.global[key] = new exports.GlobalApi.Api({
@@ -1538,7 +1547,7 @@
                 params = {};
             }
             let { env } = params;
-            env = env ? env : this.env;
+            env = this.prepEnv(env);
             const key = `${env}`;
             if (!this.guardian[key]) {
                 this.guardian[key] = new exports.GuardianApi.Api({
@@ -1641,7 +1650,7 @@
             if (!_getters) {
                 _getters = new ApiGetters({
                     accountId: ENVIRONMENT.PARAMS.accountId,
-                    env: ENVIRONMENT.PARAMS.env ? ENVIRONMENT.PARAMS.env : exports.Api.EEnv.UAT,
+                    env: ENVIRONMENT.PARAMS.env ? ENVIRONMENT.PARAMS.env : exports.Api.EEnv.PROD,
                     sessionId: ENVIRONMENT.PARAMS.sessionId
                 });
             }
@@ -1698,7 +1707,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 const key = GetCacheKey(docId);
-                const cache = yield api.GetCacheItem(key, reqParams);
+                const cache = api.GetCacheItem(key, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -1713,7 +1722,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams
@@ -1736,7 +1745,7 @@
                 if (!type) {
                     type = "";
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(type, entityId, expandSettings), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(type, entityId, expandSettings), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -1762,7 +1771,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(type, entityId, expandSettings),
                     value: req,
                     req: reqParams
@@ -1835,7 +1844,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(id), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(id), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -1850,7 +1859,7 @@
                         rej(err);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(id),
                     value: prom,
                     req: reqParams
@@ -1873,7 +1882,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 yield api.DELETE(`customForm/${id}`, exports.Api.PrepReqParams(reqParams));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.CustomForm);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.CustomForm);
             });
         }
         CustomForm.Delete = Delete;
@@ -1889,7 +1898,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 const url = typeId ? `entityType/${typeId}/customForms` : "customForms";
-                const cache = yield api.GetCacheItem(GetListCacheKey(typeId), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(typeId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -1899,7 +1908,7 @@
                         forms: data.Items
                     };
                 });
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(typeId),
                     value: prom,
                     req: reqParams
@@ -1923,7 +1932,7 @@
                     data.ID = 0;
                 }
                 const res = yield api.POST(`customForm/${data.ID}`, data, exports.Api.PrepReqParams(reqParams));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.CustomForm);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.CustomForm);
                 return {
                     form: res
                 };
@@ -2372,7 +2381,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 const key = GetCacheKey(typeId);
-                const cache = yield api.GetCacheItem(key, reqParams);
+                const cache = api.GetCacheItem(key, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -2388,7 +2397,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams
@@ -2423,11 +2432,16 @@
          */
         function GetList(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { entityTypeIds, api, req: reqParams, parentTypeId } = params;
+                let { entityTypeIds, api, req: reqParams, parentTypeId, expandSettings, search } = params;
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = parentTypeId ? null : yield api.GetCacheItem(GetListCacheKey(entityTypeIds), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey({
+                    typeIds: entityTypeIds,
+                    parentTypeId,
+                    expandSettings,
+                    search
+                }), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -2446,6 +2460,12 @@
                                 if (parentTypeId) {
                                     urlParams.append("parentEntityTypeID", parentTypeId);
                                 }
+                                if (expandSettings) {
+                                    urlParams.append("expandSettings", "true");
+                                }
+                                if (search) {
+                                    urlParams.append("search", search);
+                                }
                                 reqs.push(api.GET("entitytypes?" + urlParams.toString(), exports.Api.PrepReqParams(reqParams)));
                             }
                         }
@@ -2454,6 +2474,12 @@
                             if (parentTypeId) {
                                 urlParams.append("parentEntityTypeID", parentTypeId);
                             }
+                            if (expandSettings) {
+                                urlParams.append("expandSettings", "true");
+                            }
+                            if (search) {
+                                urlParams.append("search", search);
+                            }
                             reqs.push(api.GET("entitytypes?" + urlParams.toString(), exports.Api.PrepReqParams(reqParams)));
                         }
                         const data = yield Promise.all(reqs);
@@ -2476,8 +2502,13 @@
                     }
                 }));
                 if (!parentTypeId) {
-                    yield api.SetCacheItem({
-                        key: GetListCacheKey(entityTypeIds),
+                    api.SetCacheItem({
+                        key: GetListCacheKey({
+                            typeIds: entityTypeIds,
+                            parentTypeId,
+                            expandSettings,
+                            search
+                        }),
                         value: req,
                         req: reqParams,
                         duration: 60 * 5 // 5 minutes.
@@ -2591,11 +2622,24 @@
          * @param typeIds
          * @returns
          */
-        function GetListCacheKey(typeIds) {
+        function GetListCacheKey(params) {
+            if (!params) {
+                params = {};
+            }
+            let { typeIds, expandSettings, parentTypeId, search } = params;
+            let key = exports.Api.ECacheKey.EntityType;
             if (!typeIds) {
                 typeIds = [];
             }
-            return exports.Api.ECacheKey.EntityType + (typeIds.length ? exports.Api.ECacheKey.Id : "") + typeIds.join(",");
+            key += (typeIds.length ? exports.Api.ECacheKey.Id : "") + typeIds.join(",");
+            if (parentTypeId) {
+                key += "_PARENT_" + parentTypeId;
+            }
+            if (!expandSettings) {
+                expandSettings = false;
+            }
+            key += "_EXPAND_" + expandSettings;
+            return key;
         }
         EntityType.GetListCacheKey = GetListCacheKey;
     })(exports.EntityType || (exports.EntityType = {}));
@@ -5506,7 +5550,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -5521,7 +5565,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(),
                     value: req,
                     req: reqParams
@@ -5585,7 +5629,7 @@
                         api.Cache.Remove(GetCacheKey(attachments[i].ID));
                     }
                 }
-                yield api.Cache.Remove(GetListCacheKey(entityId));
+                api.Cache.Remove(GetListCacheKey(entityId));
                 return {
                     attachments: res.attachments
                 };
@@ -5616,7 +5660,7 @@
                 for (let i = 0; i < attachments.length; i++) {
                     api.Cache.Remove(GetCacheKey(attachments[i].ID));
                 }
-                yield api.Cache.RemoveByStartsWith(GetListCacheKey(entityId));
+                api.Cache.RemoveByStartsWith(GetListCacheKey(entityId));
             });
         }
         EntityAttachment.UpdateOrder = UpdateOrder;
@@ -5634,8 +5678,8 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 yield api.DELETE(`entity/${entityId}/attachments/${attachmentId}`, exports.Api.PrepReqParams(req));
-                yield api.Cache.Remove(GetCacheKey(attachmentId));
-                yield api.Cache.Remove(GetListCacheKey(params.entityId));
+                api.Cache.Remove(GetCacheKey(attachmentId));
+                api.Cache.Remove(GetListCacheKey(params.entityId));
             });
         }
         EntityAttachment.Delete = Delete;
@@ -5653,7 +5697,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(entityId), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(entityId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -5668,7 +5712,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(entityId),
                     value: req,
                     req: reqParams
@@ -5749,7 +5793,7 @@
                 const url = `entity/${data["TargetObject.ID"]}/comment` + (data.ID == null ? "" : "/" + data.ID);
                 const res = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Entity);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Entity);
                 return {
                     comment: res
                 };
@@ -5771,7 +5815,7 @@
                 }
                 yield api.DELETE(`entity/${entityId}/comment/${commentId}`, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(commentId));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Entity);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Comment + exports.Api.ECacheKey.Entity);
             });
         }
         EntityComment.Delete = Delete;
@@ -5789,7 +5833,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(entityId), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(entityId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -5804,7 +5848,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(entityId),
                     value: req,
                     req: reqParams
@@ -5861,7 +5905,7 @@
                 const url = `entity/${data["Entity.ID"]}/link` + (data.ID == null ? "" : "/" + data.ID);
                 const res = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Entity);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Entity);
                 return {
                     link: res
                 };
@@ -5883,7 +5927,7 @@
                 }
                 yield api.DELETE(`entity/${entityId}/link/${linkId}`, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(linkId));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Entity);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Link + exports.Api.ECacheKey.Entity);
             });
         }
         EntityLink.Delete = Delete;
@@ -5901,7 +5945,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(entityId), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(entityId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -5916,7 +5960,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(entityId),
                     value: req,
                     req: reqParams
@@ -5999,7 +6043,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(url), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(url), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -6014,7 +6058,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(url),
                     value: req,
                     req: reqParams
@@ -6061,7 +6105,7 @@
                 if (!entityId) {
                     throw ("Entity id is required.");
                 }
-                const cache = yield api.GetCacheItem(GetEntityListKey(entityId), reqParams);
+                const cache = api.GetCacheItem(GetEntityListKey(entityId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -6077,7 +6121,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetEntityListKey(entityId),
                     value: prom,
                     req: reqParams
@@ -6099,7 +6143,7 @@
                 if (!group) {
                     group = "DEFAULT";
                 }
-                const cache = yield api.GetCacheItem(GetTypeListKey(typeId, group), reqParams);
+                const cache = api.GetCacheItem(GetTypeListKey(typeId, group), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -6116,7 +6160,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetTypeListKey(typeId, group),
                     value: prom,
                     req: reqParams
@@ -6229,7 +6273,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -6244,7 +6288,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(),
                     value: req,
                     req: reqParams
@@ -6267,7 +6311,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(id), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(id), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -6282,7 +6326,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(id),
                     value: req,
                     req: reqParams
@@ -6378,7 +6422,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 const key = GetCacheKey(typeId);
-                const cache = yield api.GetCacheItem(key, reqParams);
+                const cache = api.GetCacheItem(key, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -6393,7 +6437,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams
@@ -6432,7 +6476,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -6447,7 +6491,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(),
                     value: req,
                     req: reqParams
@@ -6530,11 +6574,11 @@
                 };
                 const url = `entity/${data["Principal.Entity.ID"]}/relation/${data["Relation.Type.ID"]}/add`;
                 yield api.POST(url, reqData, exports.Api.PrepReqParams(reqParams));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Principal.Entity.ID"]);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Related.Entity.ID"]);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Principal.Entity.ID"]);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Related.Entity.ID"]);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType);
                 if (data["Data.Entity.ID"]) {
-                    yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + data["Data.Entity.ID"]);
+                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + data["Data.Entity.ID"]);
                 }
             });
         }
@@ -6557,9 +6601,9 @@
                     "Related.Entity.ID": [relatedEntityId]
                 }, exports.Api.PrepReqParams(reqParams));
                 // Remove related cache entries
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + principalEntityId);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + relatedEntityId);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType + exports.Api.ECacheKey.Id + relationTypeId);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + principalEntityId);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + relatedEntityId);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType + exports.Api.ECacheKey.Id + relationTypeId);
             });
         }
         EntityRelation.Delete = Delete;
@@ -6579,11 +6623,11 @@
                 }
                 const url = `entity/${data["Principal.Entity.ID"]}/otherEntityID/${data["Related.Entity.ID"]}/relation/${data["Relation.Type.ID"]}/update`;
                 const res = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Principal.Entity.ID"]);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Related.Entity.ID"]);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType + exports.Api.ECacheKey.Id + data["Relation.Type.ID"]);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Principal.Entity.ID"]);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Id + data["Related.Entity.ID"]);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.RelationType + exports.Api.ECacheKey.Id + data["Relation.Type.ID"]);
                 if (data["Data.Entity.ID"]) {
-                    yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + data["Data.Entity.ID"]);
+                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Relation + exports.Api.ECacheKey.Entity + exports.Api.ECacheKey.Id + data["Data.Entity.ID"]);
                 }
             });
         }
@@ -6603,7 +6647,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 filter = Object.assign({ relationTypeId: "", oneWayOnly: false, loadEntityData: false }, filter);
-                const cache = yield api.GetCacheItem(GetListCacheKey(entityId, filter), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(entityId, filter), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -6623,7 +6667,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(entityId, filter),
                     value: req,
                     req: reqParams
@@ -6646,7 +6690,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetEntityCacheKey(entityId), reqParams);
+                const cache = api.GetCacheItem(GetEntityCacheKey(entityId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -6661,7 +6705,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetEntityCacheKey(entityId),
                     value: prom,
                     req: reqParams
@@ -6769,7 +6813,7 @@
                 const reqs = [];
                 for (let i = 0; i < sourceKeys.length; i++) {
                     const sourceKey = sourceKeys[i];
-                    const cache = yield api.GetCacheItem(GetCacheKey(sourceId, sourceKey), reqParams);
+                    const cache = api.GetCacheItem(GetCacheKey(sourceId, sourceKey), reqParams);
                     if (cache === null || cache === void 0 ? void 0 : cache.found) {
                         reqs.push(cache.data);
                     }
@@ -6865,7 +6909,7 @@
                 }
                 const res = yield api.POST("entitysource", source);
                 const cacheKey = GetCacheKey(source["Source.ID"], source["SourceRecord.Key"]);
-                yield api.Cache.Remove(cacheKey);
+                api.Cache.Remove(cacheKey);
                 return {
                     source: res
                 };
@@ -6982,7 +7026,7 @@
                                 rej(e);
                             }
                         }));
-                        yield api.SetCacheItem({
+                        api.SetCacheItem({
                             key: GetCacheKey(id),
                             value: req,
                             req: reqParams
@@ -7007,7 +7051,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(entityTypeId), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(entityTypeId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -7022,7 +7066,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(entityTypeId),
                     value: req,
                     req: reqParams
@@ -7046,7 +7090,7 @@
                 }
                 yield api.DELETE(`layer/${tagId}`, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(tagId));
-                yield api.Cache.RemoveByStartsWith(GetListCacheKey());
+                api.Cache.RemoveByStartsWith(GetListCacheKey());
             });
         }
         EntityTag.Delete = Delete;
@@ -7064,7 +7108,7 @@
                 const url = data.ID ? `layer/${data.ID}` : "layer";
                 const res = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
                 api.Cache.Remove(GetCacheKey(data.ID));
-                yield api.Cache.RemoveByStartsWith(GetListCacheKey());
+                api.Cache.RemoveByStartsWith(GetListCacheKey());
                 return {
                     tag: res
                 };
@@ -7154,7 +7198,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(entityId), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(entityId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -7169,7 +7213,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(entityId),
                     value: prom,
                     req: reqParams
@@ -7461,7 +7505,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -7476,7 +7520,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(),
                     value: res,
                     req: reqParams
@@ -7499,7 +7543,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(id), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(id), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -7514,7 +7558,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(id),
                     value: prom,
                     req: reqParams
@@ -8192,7 +8236,7 @@
                     throw ("File ID is required.");
                 }
                 const key = GetCacheKey(fileId);
-                const cache = yield api.GetCacheItem(key, reqParams);
+                const cache = api.GetCacheItem(key, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -8207,7 +8251,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams
@@ -8713,7 +8757,7 @@
                 });
                 const key = prom.programKeys.find(k => k.ProgramId === programId);
                 // const key = GetCacheKey(programId);
-                // const cache = await api.GetCacheItem(key, reqParams);
+                // const cache = api.GetCacheItem(key, reqParams);
                 // if (cache?.found) {
                 //     return cache.data;
                 // }
@@ -8728,7 +8772,7 @@
                 //         rej(e);
                 //     }
                 // });
-                // await api.SetCacheItem({
+                // api.SetCacheItem({
                 //     key,
                 //     value: prom,
                 //     req: reqParams
@@ -8750,7 +8794,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -8765,7 +8809,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(),
                     value: req,
                     req: reqParams
@@ -8988,7 +9032,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(tilesetId, loadFiles), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(tilesetId, loadFiles), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -9008,7 +9052,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(tilesetId, loadFiles),
                     value: prom,
                     req: reqParams
@@ -9064,7 +9108,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey({
+                const cache = api.GetCacheItem(GetListCacheKey({
                     assertLocation: assertLocation,
                     expandSettings: expandSettings,
                     type: type
@@ -9104,7 +9148,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey({
                         assertLocation: assertLocation,
                         expandSettings: expandSettings,
@@ -9131,8 +9175,8 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 yield api.DELETE(`tileset/delete/${tilesetId}`, reqParams);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset + exports.Api.ECacheKey.Id + tilesetId);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset + exports.Api.ECacheKey.Id + tilesetId);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset);
             });
         }
         Tileset.Delete = Delete;
@@ -9169,8 +9213,8 @@
                         yield api.POST(`tileset/update/${data.id}`, data, exports.Api.PrepReqParams(reqParams));
                     }
                 }
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset + exports.Api.ECacheKey.Id + data.id);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset + exports.Api.ECacheKey.Id + data.id);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Tileset);
                 return {
                     tileset: data
                 };
@@ -9455,9 +9499,9 @@
                     };
                     data.ID = res.ID;
                     yield api.POST(`tileset/${data.ID}/enableForAccounts`, req, reqParams);
-                    yield api.Cache.Remove(GetCacheKey(data["PublishedBy.ClientAccount.ID"], data["Tileset.ID"]));
-                    yield api.Cache.Remove(GetCacheKey(data["PublishedBy.ClientAccount.ID"]));
-                    yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.PublishTileset + exports.Api.ECacheKey.TilesetAccess);
+                    api.Cache.Remove(GetCacheKey(data["PublishedBy.ClientAccount.ID"], data["Tileset.ID"]));
+                    api.Cache.Remove(GetCacheKey(data["PublishedBy.ClientAccount.ID"]));
+                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.PublishTileset + exports.Api.ECacheKey.TilesetAccess);
                     return {
                         published: data
                     };
@@ -9473,7 +9517,7 @@
                     if (!accountId || !tilesetId) {
                         throw ("Client account ID and tileset ID are required.");
                     }
-                    const cache = yield api.GetCacheItem(GetCacheKey(accountId, tilesetId), reqParams);
+                    const cache = api.GetCacheItem(GetCacheKey(accountId, tilesetId), reqParams);
                     if (cache === null || cache === void 0 ? void 0 : cache.found) {
                         return cache.data;
                     }
@@ -9488,7 +9532,7 @@
                             rej(e);
                         }
                     }));
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key: GetCacheKey(accountId, tilesetId),
                         value: prom,
                         req: reqParams
@@ -9506,7 +9550,7 @@
                     if (!accountId) {
                         throw ("Client account ID is required.");
                     }
-                    const cache = yield api.GetCacheItem(GetCacheKey(accountId), reqParams);
+                    const cache = api.GetCacheItem(GetCacheKey(accountId), reqParams);
                     if (cache === null || cache === void 0 ? void 0 : cache.found) {
                         return cache.data;
                     }
@@ -9521,7 +9565,7 @@
                             rej(e);
                         }
                     }));
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key: GetCacheKey(accountId),
                         value: req,
                         req: reqParams
@@ -9847,7 +9891,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 const key = GetCacheKey(viewId, bookmarkId);
-                const cache = yield api.GetCacheItem(key, reqParams);
+                const cache = api.GetCacheItem(key, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -9862,7 +9906,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams
@@ -9904,7 +9948,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(viewId), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(viewId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -9922,7 +9966,7 @@
                                     bookmark: item
                                 });
                             });
-                            yield api.SetCacheItem({
+                            api.SetCacheItem({
                                 key: GetCacheKey(viewId, item.ID),
                                 value: prom,
                                 req: reqParams
@@ -9936,7 +9980,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(viewId),
                     value: req,
                     req: reqParams
@@ -9983,7 +10027,7 @@
                     "DisplayOrder.Start": 0
                 };
                 yield api.POST(`ui.view/${viewId}/slides/setOrder`, reqData, exports.Api.PrepReqParams(reqParams));
-                yield api.Cache.RemoveByStartsWith(GetListCacheKey(viewId));
+                api.Cache.RemoveByStartsWith(GetListCacheKey(viewId));
             });
         }
         ProjectViewBookmark.SetOrder = SetOrder;
@@ -10043,7 +10087,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 const key = GetCacheKey(viewId);
-                const cache = yield api.GetCacheItem(key, reqParams);
+                const cache = api.GetCacheItem(key, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -10058,7 +10102,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams
@@ -10078,7 +10122,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(type), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(type), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -10093,7 +10137,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(type),
                     value: prom,
                     req: reqParams
@@ -10687,7 +10731,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(id), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(id), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -10696,7 +10740,7 @@
                         const data = yield api.GET(`accountbyid/${id}`, reqParams);
                         // Update the cache by subdomain as well in case it's different to the ID.
                         if ((data === null || data === void 0 ? void 0 : data.ID) && (reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache) != false) {
-                            yield api.SetCacheItem({
+                            api.SetCacheItem({
                                 key: data.Subdomain,
                                 value: prom,
                                 req: reqParams
@@ -10710,7 +10754,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(id),
                     value: prom,
                     req: reqParams
@@ -10730,7 +10774,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(subdomain), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(subdomain), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -10739,7 +10783,7 @@
                         const data = yield api.GET(`account/${subdomain}`, reqParams);
                         // Update the cache by ID as well in case it's different to the subdomain.
                         if ((data === null || data === void 0 ? void 0 : data.ID) && (reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache) != false) {
-                            yield api.SetCacheItem({
+                            api.SetCacheItem({
                                 key: data.ID,
                                 value: prom,
                                 req: reqParams
@@ -10753,7 +10797,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(subdomain),
                     value: prom,
                     req: reqParams
@@ -10773,7 +10817,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(api.GetSessionId()), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(api.GetSessionId()), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -10790,7 +10834,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(api.GetSessionId()),
                     value: prom,
                     req: reqParams
@@ -10810,7 +10854,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(id, appId), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(id, appId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -10828,7 +10872,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(id, appId),
                     value: prom,
                     req: reqParams
@@ -10850,7 +10894,7 @@
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
                 const res = yield api.POST(`account/${id}/applicationSettings/${appId}`, data, reqParams);
-                yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + id);
+                api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.Account + exports.Api.ECacheKey.Id + id);
                 return {
                     settings: res
                 };
@@ -11179,7 +11223,7 @@
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
                 const key = GetCacheKey(sessionId);
-                const cache = yield api.GetCacheItem(key, reqParams);
+                const cache = api.GetCacheItem(key, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -11194,7 +11238,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key,
                     value: prom,
                     req: reqParams,
@@ -11571,13 +11615,22 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(id, accountId), reqParams);
+                const cacheKey = GetCacheKey(id, accountId);
+                const cache = api.GetCacheItem(cacheKey, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
                 const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                     try {
-                        const data = yield api.GET(`user/${id}${accountId ? `?clientAccountID=${accountId}` : ""}`, reqParams);
+                        const urlParams = new URLSearchParams();
+                        if (accountId) {
+                            urlParams.append("clientAccountID", accountId);
+                        }
+                        let url = `user/${id}`;
+                        if (urlParams.toString().length) {
+                            url += "?" + urlParams.toString();
+                        }
+                        const data = yield api.GET(url, reqParams);
                         res({
                             user: data
                         });
@@ -11586,8 +11639,8 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
-                    key: GetCacheKey(id, accountId),
+                api.SetCacheItem({
+                    key: cacheKey,
                     value: prom,
                     req: reqParams
                 });
@@ -11626,10 +11679,10 @@
                 const res = yield api.POST(`user/${data.ID}`, data, reqParams);
                 api.Cache.RemoveByContains(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + data.ID);
                 if (data.Type == EType.AccessToken) {
-                    yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
+                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
                 }
                 else if (data.Type == EType.User) {
-                    yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Account);
+                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Account);
                 }
                 return {
                     user: res
@@ -11651,7 +11704,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetGuardianApi();
                 }
-                const cache = yield api.GetCacheItem(GetSettingsCacheKey(userId, appId), req);
+                const cache = api.GetCacheItem(GetSettingsCacheKey(userId, appId), req);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -11677,7 +11730,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetSettingsCacheKey(userId, appId),
                     value: prom,
                     req: req
@@ -11773,7 +11826,7 @@
                     if (!api) {
                         api = exports.ENVIRONMENT.Api().GetGuardianApi();
                     }
-                    const cache = yield api.GetCacheItem(GetEmailCacheKey(email, accountId), reqParams);
+                    const cache = api.GetCacheItem(GetEmailCacheKey(email, accountId), reqParams);
                     if (cache === null || cache === void 0 ? void 0 : cache.found) {
                         return cache.data;
                     }
@@ -11788,7 +11841,7 @@
                             rej(e);
                         }
                     }));
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key: GetEmailCacheKey(email, accountId),
                         value: prom,
                         req: reqParams
@@ -11814,7 +11867,7 @@
                     if (!exclusive) {
                         exclusive = false;
                     }
-                    const cache = exclusive ? null : yield api.GetCacheItem(GetListCacheKey(accountId), reqParams);
+                    const cache = exclusive ? null : api.GetCacheItem(GetListCacheKey(accountId), reqParams);
                     if (cache === null || cache === void 0 ? void 0 : cache.found) {
                         return cache.data;
                     }
@@ -11832,7 +11885,7 @@
                     req.then((data) => __awaiter(this, void 0, void 0, function* () {
                         const users = data.users;
                         for (let i = 0; i < users.length; i++) {
-                            yield api.SetCacheItem({
+                            api.SetCacheItem({
                                 key: GetCacheKey(users[i].ID, accountId),
                                 value: {
                                     user: users[i]
@@ -11842,7 +11895,7 @@
                         }
                     }));
                     if (!exclusive) {
-                        yield api.SetCacheItem({
+                        api.SetCacheItem({
                             key: GetListCacheKey(accountId),
                             value: req,
                             req: reqParams
@@ -12009,7 +12062,7 @@
                     if (!api) {
                         api = exports.ENVIRONMENT.Api().GetGuardianApi();
                     }
-                    const cache = yield api.GetCacheItem(GetListCacheKey(accountId), reqParams);
+                    const cache = api.GetCacheItem(GetListCacheKey(accountId), reqParams);
                     if (cache === null || cache === void 0 ? void 0 : cache.found) {
                         return cache.data;
                     }
@@ -12024,7 +12077,7 @@
                             rej(e);
                         }
                     }));
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key: GetListCacheKey(accountId),
                         value: req,
                         req: reqParams
@@ -12045,7 +12098,7 @@
                     }
                     yield api.DELETE(`accessToken/${id}`, reqParams);
                     api.Cache.RemoveByContains(exports.Api.ECacheKey.User + exports.Api.ECacheKey.Id + id);
-                    yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
+                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
                 });
             }
             AccessToken.Delete = Delete;
@@ -12070,7 +12123,7 @@
                         data.Type = EType.AccessToken;
                     }
                     data = yield api.POST("accessToken", data, reqParams);
-                    yield api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
+                    api.Cache.RemoveByStartsWith(exports.Api.ECacheKey.AccessToken + exports.Api.ECacheKey.Account);
                     return {
                         user: data
                     };
@@ -12274,7 +12327,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 const accountId = api.AccountId;
-                const cache = yield api.GetCacheItem(GetCacheKey(accountId), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(accountId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -13287,7 +13340,7 @@
                 if (!pageIndex) {
                     pageIndex = 0;
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(type, pageIndex), reqParams);
+                const cache = api.GetCacheItem(GetListCacheKey(type, pageIndex), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -13312,7 +13365,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(type, pageIndex),
                     value: prom,
                     req: reqParams
@@ -13332,7 +13385,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKeyByRootId(rootId), reqParams);
+                const cache = api.GetCacheItem(GetCacheKeyByRootId(rootId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -13347,7 +13400,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKeyByRootId(rootId),
                     value: prom,
                     req: reqParams
@@ -13367,7 +13420,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(fileId), reqParams);
+                const cache = api.GetCacheItem(GetCacheKey(fileId), reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -13382,7 +13435,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(fileId),
                     value: prom,
                     req: reqParams
@@ -13602,7 +13655,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetCacheKey(pluginId), req);
+                const cache = api.GetCacheItem(GetCacheKey(pluginId), req);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -13617,7 +13670,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(pluginId),
                     value: prom,
                     req: req
@@ -13637,7 +13690,7 @@
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
-                const cache = yield api.GetCacheItem(GetListCacheKey(), req);
+                const cache = api.GetCacheItem(GetListCacheKey(), req);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     return cache.data;
                 }
@@ -13652,7 +13705,7 @@
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(),
                     value: prom,
                     req: req
@@ -13936,8 +13989,8 @@
                 }
                 const url = `source` + (data.ID == null ? "" : "/" + data.ID);
                 const res = yield api.POST(url, data, exports.Api.PrepReqParams(reqParams));
-                yield api.Cache.Remove(GetCacheKey(data.ID));
-                yield api.Cache.Remove(GetListCacheKey());
+                api.Cache.Remove(GetCacheKey(data.ID));
+                api.Cache.Remove(GetListCacheKey());
                 return {
                     source: res
                 };
@@ -13955,8 +14008,8 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 yield api.DELETE(`source/${id}`, exports.Api.PrepReqParams(reqParams));
-                yield api.Cache.Remove(GetCacheKey(id));
-                yield api.Cache.Remove(GetListCacheKey());
+                api.Cache.Remove(GetCacheKey(id));
+                api.Cache.Remove(GetListCacheKey());
             });
         }
         DataSource.Delete = Delete;
@@ -13972,7 +14025,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 reqParams = exports.Api.PrepReqParams(reqParams);
-                const cacheData = yield api.GetCacheItem(GetCacheKey(id), reqParams);
+                const cacheData = api.GetCacheItem(GetCacheKey(id), reqParams);
                 if (cacheData === null || cacheData === void 0 ? void 0 : cacheData.found) {
                     return cacheData.data;
                 }
@@ -14008,7 +14061,7 @@
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 reqParams = exports.Api.PrepReqParams(reqParams);
-                const cacheData = yield api.GetCacheItem(GetListCacheKey(), reqParams);
+                const cacheData = api.GetCacheItem(GetListCacheKey(), reqParams);
                 if (cacheData === null || cacheData === void 0 ? void 0 : cacheData.found) {
                     return cacheData.data;
                 }
@@ -14086,7 +14139,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.9.7";
+    const VERSION = "4.9.9";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;