bruce-models 4.9.7 → 4.9.9

package/dist/bruce-models.es5.js

@@ -368,7 +368,7 @@ class AbstractApi {
         if (noCache) {
             return;
         }
-        if (isNaN(duration)) {
+        if (isNaN(duration) || duration == null) {
             duration = Api.DEFAULT_CACHE_DURATION;
         }
         this.Cache.Set({
@@ -1399,6 +1399,15 @@ class ApiGetters {
         this.env = (params === null || params === void 0 ? void 0 : params.env) ? params.env : Api.EEnv.PROD;
         this.sessionId = params === null || params === void 0 ? void 0 : params.sessionId;
     }
+    prepEnv(_env) {
+        if (!_env) {
+            _env = this.env;
+        }
+        if (!_env) {
+            _env = Api.EEnv.PROD;
+        }
+        return _env.toUpperCase();
+    }
     /**
      * Clears all cache items in all API instances.
      */
@@ -1489,7 +1498,7 @@ class ApiGetters {
         }
         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 BruceApi.Api({
@@ -1533,7 +1542,7 @@ class ApiGetters {
             params = {};
         }
         let { env } = params;
-        env = env ? env : this.env;
+        env = this.prepEnv(env);
         const key = `${env}`;
         if (!this.global[key]) {
             this.global[key] = new GlobalApi.Api({
@@ -1553,7 +1562,7 @@ class ApiGetters {
             params = {};
         }
         let { env } = params;
-        env = env ? env : this.env;
+        env = this.prepEnv(env);
         const key = `${env}`;
         if (!this.guardian[key]) {
             this.guardian[key] = new GuardianApi.Api({
@@ -1657,7 +1666,7 @@ var ENVIRONMENT;
         if (!_getters) {
             _getters = new ApiGetters({
                 accountId: ENVIRONMENT.PARAMS.accountId,
-                env: ENVIRONMENT.PARAMS.env ? ENVIRONMENT.PARAMS.env : Api.EEnv.UAT,
+                env: ENVIRONMENT.PARAMS.env ? ENVIRONMENT.PARAMS.env : Api.EEnv.PROD,
                 sessionId: ENVIRONMENT.PARAMS.sessionId
             });
         }
@@ -1719,7 +1728,7 @@ var AnnDocument;
                 api = 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;
             }
@@ -1734,7 +1743,7 @@ var AnnDocument;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams
@@ -1757,7 +1766,7 @@ var AnnDocument;
             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;
             }
@@ -1783,7 +1792,7 @@ var AnnDocument;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(type, entityId, expandSettings),
                 value: req,
                 req: reqParams
@@ -1861,7 +1870,7 @@ var CustomForm;
             if (!api) {
                 api = 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;
             }
@@ -1876,7 +1885,7 @@ var CustomForm;
                     rej(err);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(id),
                 value: prom,
                 req: reqParams
@@ -1899,7 +1908,7 @@ var CustomForm;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             yield api.DELETE(`customForm/${id}`, Api.PrepReqParams(reqParams));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.CustomForm);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.CustomForm);
         });
     }
     CustomForm.Delete = Delete;
@@ -1915,7 +1924,7 @@ var CustomForm;
                 api = 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;
             }
@@ -1925,7 +1934,7 @@ var CustomForm;
                     forms: data.Items
                 };
             });
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(typeId),
                 value: prom,
                 req: reqParams
@@ -1949,7 +1958,7 @@ var CustomForm;
                 data.ID = 0;
             }
             const res = yield api.POST(`customForm/${data.ID}`, data, Api.PrepReqParams(reqParams));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.CustomForm);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.CustomForm);
             return {
                 form: res
             };
@@ -2407,7 +2416,7 @@ var EntityType;
                 api = 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;
             }
@@ -2423,7 +2432,7 @@ var EntityType;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams
@@ -2458,11 +2467,16 @@ var EntityType;
      */
     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 = 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;
             }
@@ -2481,6 +2495,12 @@ var EntityType;
                             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(), Api.PrepReqParams(reqParams)));
                         }
                     }
@@ -2489,6 +2509,12 @@ var EntityType;
                         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(), Api.PrepReqParams(reqParams)));
                     }
                     const data = yield Promise.all(reqs);
@@ -2511,8 +2537,13 @@ var EntityType;
                 }
             }));
             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.
@@ -2626,11 +2657,24 @@ var EntityType;
      * @param typeIds
      * @returns
      */
-    function GetListCacheKey(typeIds) {
+    function GetListCacheKey(params) {
+        if (!params) {
+            params = {};
+        }
+        let { typeIds, expandSettings, parentTypeId, search } = params;
+        let key = Api.ECacheKey.EntityType;
         if (!typeIds) {
             typeIds = [];
         }
-        return Api.ECacheKey.EntityType + (typeIds.length ? Api.ECacheKey.Id : "") + typeIds.join(",");
+        key += (typeIds.length ? Api.ECacheKey.Id : "") + typeIds.join(",");
+        if (parentTypeId) {
+            key += "_PARENT_" + parentTypeId;
+        }
+        if (!expandSettings) {
+            expandSettings = false;
+        }
+        key += "_EXPAND_" + expandSettings;
+        return key;
     }
     EntityType.GetListCacheKey = GetListCacheKey;
 })(EntityType || (EntityType = {}));
@@ -5576,7 +5620,7 @@ var EntityAttachmentType;
             if (!api) {
                 api = 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;
             }
@@ -5591,7 +5635,7 @@ var EntityAttachmentType;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(),
                 value: req,
                 req: reqParams
@@ -5661,7 +5705,7 @@ var EntityAttachment;
                     api.Cache.Remove(GetCacheKey(attachments[i].ID));
                 }
             }
-            yield api.Cache.Remove(GetListCacheKey(entityId));
+            api.Cache.Remove(GetListCacheKey(entityId));
             return {
                 attachments: res.attachments
             };
@@ -5692,7 +5736,7 @@ var EntityAttachment;
             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;
@@ -5710,8 +5754,8 @@ var EntityAttachment;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             yield api.DELETE(`entity/${entityId}/attachments/${attachmentId}`, 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;
@@ -5729,7 +5773,7 @@ var EntityAttachment;
             if (!api) {
                 api = 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;
             }
@@ -5744,7 +5788,7 @@ var EntityAttachment;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(entityId),
                 value: req,
                 req: reqParams
@@ -5833,7 +5877,7 @@ var EntityComment;
             const url = `entity/${data["TargetObject.ID"]}/comment` + (data.ID == null ? "" : "/" + data.ID);
             const res = yield api.POST(url, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ID));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Comment + Api.ECacheKey.Entity);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Comment + Api.ECacheKey.Entity);
             return {
                 comment: res
             };
@@ -5855,7 +5899,7 @@ var EntityComment;
             }
             yield api.DELETE(`entity/${entityId}/comment/${commentId}`, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(commentId));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Comment + Api.ECacheKey.Entity);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Comment + Api.ECacheKey.Entity);
         });
     }
     EntityComment.Delete = Delete;
@@ -5873,7 +5917,7 @@ var EntityComment;
             if (!api) {
                 api = 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;
             }
@@ -5888,7 +5932,7 @@ var EntityComment;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(entityId),
                 value: req,
                 req: reqParams
@@ -5950,7 +5994,7 @@ var EntityLink;
             const url = `entity/${data["Entity.ID"]}/link` + (data.ID == null ? "" : "/" + data.ID);
             const res = yield api.POST(url, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ID));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Link + Api.ECacheKey.Entity);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Link + Api.ECacheKey.Entity);
             return {
                 link: res
             };
@@ -5972,7 +6016,7 @@ var EntityLink;
             }
             yield api.DELETE(`entity/${entityId}/link/${linkId}`, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(linkId));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Link + Api.ECacheKey.Entity);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Link + Api.ECacheKey.Entity);
         });
     }
     EntityLink.Delete = Delete;
@@ -5990,7 +6034,7 @@ var EntityLink;
             if (!api) {
                 api = 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;
             }
@@ -6005,7 +6049,7 @@ var EntityLink;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(entityId),
                 value: req,
                 req: reqParams
@@ -6095,7 +6139,7 @@ var EntityLod;
             if (!api) {
                 api = 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;
             }
@@ -6110,7 +6154,7 @@ var EntityLod;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(url),
                 value: req,
                 req: reqParams
@@ -6157,7 +6201,7 @@ var EntityLod;
             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;
             }
@@ -6173,7 +6217,7 @@ var EntityLod;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetEntityListKey(entityId),
                 value: prom,
                 req: reqParams
@@ -6195,7 +6239,7 @@ var EntityLod;
             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;
             }
@@ -6212,7 +6256,7 @@ var EntityLod;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetTypeListKey(typeId, group),
                 value: prom,
                 req: reqParams
@@ -6331,7 +6375,7 @@ var EntityLodCategory;
             if (!api) {
                 api = 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;
             }
@@ -6346,7 +6390,7 @@ var EntityLodCategory;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(),
                 value: req,
                 req: reqParams
@@ -6369,7 +6413,7 @@ var EntityLodCategory;
             if (!api) {
                 api = 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;
             }
@@ -6384,7 +6428,7 @@ var EntityLodCategory;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(id),
                 value: req,
                 req: reqParams
@@ -6485,7 +6529,7 @@ var EntityRelationType;
                 api = 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;
             }
@@ -6500,7 +6544,7 @@ var EntityRelationType;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams
@@ -6539,7 +6583,7 @@ var EntityRelationType;
             if (!api) {
                 api = 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;
             }
@@ -6554,7 +6598,7 @@ var EntityRelationType;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(),
                 value: req,
                 req: reqParams
@@ -6643,11 +6687,11 @@ var EntityRelation;
             };
             const url = `entity/${data["Principal.Entity.ID"]}/relation/${data["Relation.Type.ID"]}/add`;
             yield api.POST(url, reqData, Api.PrepReqParams(reqParams));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Principal.Entity.ID"]);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Related.Entity.ID"]);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.RelationType);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Principal.Entity.ID"]);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Related.Entity.ID"]);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.RelationType);
             if (data["Data.Entity.ID"]) {
-                yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Entity + Api.ECacheKey.Id + data["Data.Entity.ID"]);
+                api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Entity + Api.ECacheKey.Id + data["Data.Entity.ID"]);
             }
         });
     }
@@ -6670,9 +6714,9 @@ var EntityRelation;
                 "Related.Entity.ID": [relatedEntityId]
             }, Api.PrepReqParams(reqParams));
             // Remove related cache entries
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + principalEntityId);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + relatedEntityId);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.RelationType + Api.ECacheKey.Id + relationTypeId);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + principalEntityId);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + relatedEntityId);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.RelationType + Api.ECacheKey.Id + relationTypeId);
         });
     }
     EntityRelation.Delete = Delete;
@@ -6692,11 +6736,11 @@ var EntityRelation;
             }
             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, Api.PrepReqParams(reqParams));
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Principal.Entity.ID"]);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Related.Entity.ID"]);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.RelationType + Api.ECacheKey.Id + data["Relation.Type.ID"]);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Principal.Entity.ID"]);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Id + data["Related.Entity.ID"]);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.RelationType + Api.ECacheKey.Id + data["Relation.Type.ID"]);
             if (data["Data.Entity.ID"]) {
-                yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Entity + Api.ECacheKey.Id + data["Data.Entity.ID"]);
+                api.Cache.RemoveByStartsWith(Api.ECacheKey.Relation + Api.ECacheKey.Entity + Api.ECacheKey.Id + data["Data.Entity.ID"]);
             }
         });
     }
@@ -6716,7 +6760,7 @@ var EntityRelation;
                 api = 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;
             }
@@ -6736,7 +6780,7 @@ var EntityRelation;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(entityId, filter),
                 value: req,
                 req: reqParams
@@ -6759,7 +6803,7 @@ var EntityRelation;
             if (!api) {
                 api = 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;
             }
@@ -6774,7 +6818,7 @@ var EntityRelation;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetEntityCacheKey(entityId),
                 value: prom,
                 req: reqParams
@@ -6888,7 +6932,7 @@ var EntitySource;
             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);
                 }
@@ -6984,7 +7028,7 @@ var EntitySource;
             }
             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
             };
@@ -7107,7 +7151,7 @@ var EntityTag;
                             rej(e);
                         }
                     }));
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key: GetCacheKey(id),
                         value: req,
                         req: reqParams
@@ -7132,7 +7176,7 @@ var EntityTag;
             if (!api) {
                 api = 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;
             }
@@ -7147,7 +7191,7 @@ var EntityTag;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(entityTypeId),
                 value: req,
                 req: reqParams
@@ -7171,7 +7215,7 @@ var EntityTag;
             }
             yield api.DELETE(`layer/${tagId}`, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(tagId));
-            yield api.Cache.RemoveByStartsWith(GetListCacheKey());
+            api.Cache.RemoveByStartsWith(GetListCacheKey());
         });
     }
     EntityTag.Delete = Delete;
@@ -7189,7 +7233,7 @@ var EntityTag;
             const url = data.ID ? `layer/${data.ID}` : "layer";
             const res = yield api.POST(url, data, Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ID));
-            yield api.Cache.RemoveByStartsWith(GetListCacheKey());
+            api.Cache.RemoveByStartsWith(GetListCacheKey());
             return {
                 tag: res
             };
@@ -7284,7 +7328,7 @@ var EntityCoords;
             if (!api) {
                 api = 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;
             }
@@ -7299,7 +7343,7 @@ var EntityCoords;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(entityId),
                 value: prom,
                 req: reqParams
@@ -7605,7 +7649,7 @@ var Style;
             if (!api) {
                 api = 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;
             }
@@ -7620,7 +7664,7 @@ var Style;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(),
                 value: res,
                 req: reqParams
@@ -7643,7 +7687,7 @@ var Style;
             if (!api) {
                 api = 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;
             }
@@ -7658,7 +7702,7 @@ var Style;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(id),
                 value: prom,
                 req: reqParams
@@ -8351,7 +8395,7 @@ var ClientFile;
                 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;
             }
@@ -8366,7 +8410,7 @@ var ClientFile;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams
@@ -8877,7 +8921,7 @@ var ProgramKey;
             });
             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;
             // }
@@ -8892,7 +8936,7 @@ var ProgramKey;
             //         rej(e);
             //     }
             // });
-            // await api.SetCacheItem({
+            // api.SetCacheItem({
             //     key,
             //     value: prom,
             //     req: reqParams
@@ -8914,7 +8958,7 @@ var ProgramKey;
             if (!api) {
                 api = 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;
             }
@@ -8929,7 +8973,7 @@ var ProgramKey;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(),
                 value: req,
                 req: reqParams
@@ -9164,7 +9208,7 @@ var Tileset;
             if (!api) {
                 api = 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;
             }
@@ -9184,7 +9228,7 @@ var Tileset;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(tilesetId, loadFiles),
                 value: prom,
                 req: reqParams
@@ -9240,7 +9284,7 @@ var Tileset;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const cache = yield api.GetCacheItem(GetListCacheKey({
+            const cache = api.GetCacheItem(GetListCacheKey({
                 assertLocation: assertLocation,
                 expandSettings: expandSettings,
                 type: type
@@ -9280,7 +9324,7 @@ var Tileset;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey({
                     assertLocation: assertLocation,
                     expandSettings: expandSettings,
@@ -9307,8 +9351,8 @@ var Tileset;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             yield api.DELETE(`tileset/delete/${tilesetId}`, reqParams);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset + Api.ECacheKey.Id + tilesetId);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset + Api.ECacheKey.Id + tilesetId);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset);
         });
     }
     Tileset$$1.Delete = Delete;
@@ -9345,8 +9389,8 @@ var Tileset;
                     yield api.POST(`tileset/update/${data.id}`, data, Api.PrepReqParams(reqParams));
                 }
             }
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset + Api.ECacheKey.Id + data.id);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset + Api.ECacheKey.Id + data.id);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Tileset);
             return {
                 tileset: data
             };
@@ -9631,9 +9675,9 @@ var Tileset;
                 };
                 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(Api.ECacheKey.PublishTileset + 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(Api.ECacheKey.PublishTileset + Api.ECacheKey.TilesetAccess);
                 return {
                     published: data
                 };
@@ -9649,7 +9693,7 @@ var Tileset;
                 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;
                 }
@@ -9664,7 +9708,7 @@ var Tileset;
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(accountId, tilesetId),
                     value: prom,
                     req: reqParams
@@ -9682,7 +9726,7 @@ var Tileset;
                 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;
                 }
@@ -9697,7 +9741,7 @@ var Tileset;
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetCacheKey(accountId),
                     value: req,
                     req: reqParams
@@ -10036,7 +10080,7 @@ var ProjectViewBookmark;
                 api = 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;
             }
@@ -10051,7 +10095,7 @@ var ProjectViewBookmark;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams
@@ -10093,7 +10137,7 @@ var ProjectViewBookmark;
             if (!api) {
                 api = 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;
             }
@@ -10111,7 +10155,7 @@ var ProjectViewBookmark;
                                 bookmark: item
                             });
                         });
-                        yield api.SetCacheItem({
+                        api.SetCacheItem({
                             key: GetCacheKey(viewId, item.ID),
                             value: prom,
                             req: reqParams
@@ -10125,7 +10169,7 @@ var ProjectViewBookmark;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(viewId),
                 value: req,
                 req: reqParams
@@ -10172,7 +10216,7 @@ var ProjectViewBookmark;
                 "DisplayOrder.Start": 0
             };
             yield api.POST(`ui.view/${viewId}/slides/setOrder`, reqData, Api.PrepReqParams(reqParams));
-            yield api.Cache.RemoveByStartsWith(GetListCacheKey(viewId));
+            api.Cache.RemoveByStartsWith(GetListCacheKey(viewId));
         });
     }
     ProjectViewBookmark.SetOrder = SetOrder;
@@ -10238,7 +10282,7 @@ var ProjectView;
                 api = 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;
             }
@@ -10253,7 +10297,7 @@ var ProjectView;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams
@@ -10273,7 +10317,7 @@ var ProjectView;
             if (!api) {
                 api = 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;
             }
@@ -10288,7 +10332,7 @@ var ProjectView;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(type),
                 value: prom,
                 req: reqParams
@@ -10902,7 +10946,7 @@ var Account;
             if (!api) {
                 api = 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;
             }
@@ -10911,7 +10955,7 @@ var Account;
                     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
@@ -10925,7 +10969,7 @@ var Account;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(id),
                 value: prom,
                 req: reqParams
@@ -10945,7 +10989,7 @@ var Account;
             if (!api) {
                 api = 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;
             }
@@ -10954,7 +10998,7 @@ var Account;
                     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
@@ -10968,7 +11012,7 @@ var Account;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(subdomain),
                 value: prom,
                 req: reqParams
@@ -10988,7 +11032,7 @@ var Account;
             if (!api) {
                 api = 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;
             }
@@ -11005,7 +11049,7 @@ var Account;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(api.GetSessionId()),
                 value: prom,
                 req: reqParams
@@ -11025,7 +11069,7 @@ var Account;
             if (!api) {
                 api = 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;
             }
@@ -11043,7 +11087,7 @@ var Account;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(id, appId),
                 value: prom,
                 req: reqParams
@@ -11065,7 +11109,7 @@ var Account;
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
             const res = yield api.POST(`account/${id}/applicationSettings/${appId}`, data, reqParams);
-            yield api.Cache.RemoveByStartsWith(Api.ECacheKey.Account + Api.ECacheKey.Id + id);
+            api.Cache.RemoveByStartsWith(Api.ECacheKey.Account + Api.ECacheKey.Id + id);
             return {
                 settings: res
             };
@@ -11406,7 +11450,7 @@ var Session;
                 api = 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;
             }
@@ -11421,7 +11465,7 @@ var Session;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key,
                 value: prom,
                 req: reqParams,
@@ -11811,13 +11855,22 @@ var User;
             if (!api) {
                 api = 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
                     });
@@ -11826,8 +11879,8 @@ var User;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
-                key: GetCacheKey(id, accountId),
+            api.SetCacheItem({
+                key: cacheKey,
                 value: prom,
                 req: reqParams
             });
@@ -11866,10 +11919,10 @@ var User;
             const res = yield api.POST(`user/${data.ID}`, data, reqParams);
             api.Cache.RemoveByContains(Api.ECacheKey.User + Api.ECacheKey.Id + data.ID);
             if (data.Type == EType.AccessToken) {
-                yield api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
+                api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
             }
             else if (data.Type == EType.User) {
-                yield api.Cache.RemoveByStartsWith(Api.ECacheKey.User + Api.ECacheKey.Account);
+                api.Cache.RemoveByStartsWith(Api.ECacheKey.User + Api.ECacheKey.Account);
             }
             return {
                 user: res
@@ -11891,7 +11944,7 @@ var User;
             if (!api) {
                 api = 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;
             }
@@ -11917,7 +11970,7 @@ var User;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetSettingsCacheKey(userId, appId),
                 value: prom,
                 req: req
@@ -12013,7 +12066,7 @@ var User;
                 if (!api) {
                     api = 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;
                 }
@@ -12028,7 +12081,7 @@ var User;
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetEmailCacheKey(email, accountId),
                     value: prom,
                     req: reqParams
@@ -12054,7 +12107,7 @@ var User;
                 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;
                 }
@@ -12072,7 +12125,7 @@ var User;
                 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]
@@ -12082,7 +12135,7 @@ var User;
                     }
                 }));
                 if (!exclusive) {
-                    yield api.SetCacheItem({
+                    api.SetCacheItem({
                         key: GetListCacheKey(accountId),
                         value: req,
                         req: reqParams
@@ -12249,7 +12302,7 @@ var User;
                 if (!api) {
                     api = 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;
                 }
@@ -12264,7 +12317,7 @@ var User;
                         rej(e);
                     }
                 }));
-                yield api.SetCacheItem({
+                api.SetCacheItem({
                     key: GetListCacheKey(accountId),
                     value: req,
                     req: reqParams
@@ -12285,7 +12338,7 @@ var User;
                 }
                 yield api.DELETE(`accessToken/${id}`, reqParams);
                 api.Cache.RemoveByContains(Api.ECacheKey.User + Api.ECacheKey.Id + id);
-                yield api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
+                api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
             });
         }
         AccessToken.Delete = Delete;
@@ -12310,7 +12363,7 @@ var User;
                     data.Type = EType.AccessToken;
                 }
                 data = yield api.POST("accessToken", data, reqParams);
-                yield api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
+                api.Cache.RemoveByStartsWith(Api.ECacheKey.AccessToken + Api.ECacheKey.Account);
                 return {
                     user: data
                 };
@@ -12524,7 +12577,7 @@ var AccountFeatures;
                 api = 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;
             }
@@ -13562,7 +13615,7 @@ var ImportedFile;
             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;
             }
@@ -13587,7 +13640,7 @@ var ImportedFile;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(type, pageIndex),
                 value: prom,
                 req: reqParams
@@ -13607,7 +13660,7 @@ var ImportedFile;
             if (!api) {
                 api = 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;
             }
@@ -13622,7 +13675,7 @@ var ImportedFile;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKeyByRootId(rootId),
                 value: prom,
                 req: reqParams
@@ -13642,7 +13695,7 @@ var ImportedFile;
             if (!api) {
                 api = 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;
             }
@@ -13657,7 +13710,7 @@ var ImportedFile;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(fileId),
                 value: prom,
                 req: reqParams
@@ -13879,7 +13932,7 @@ var Plugin;
             if (!api) {
                 api = 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;
             }
@@ -13894,7 +13947,7 @@ var Plugin;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetCacheKey(pluginId),
                 value: prom,
                 req: req
@@ -13914,7 +13967,7 @@ var Plugin;
             if (!api) {
                 api = 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;
             }
@@ -13929,7 +13982,7 @@ var Plugin;
                     rej(e);
                 }
             }));
-            yield api.SetCacheItem({
+            api.SetCacheItem({
                 key: GetListCacheKey(),
                 value: prom,
                 req: req
@@ -14214,8 +14267,8 @@ var DataSource;
             }
             const url = `source` + (data.ID == null ? "" : "/" + data.ID);
             const res = yield api.POST(url, data, 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
             };
@@ -14233,8 +14286,8 @@ var DataSource;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             yield api.DELETE(`source/${id}`, 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;
@@ -14250,7 +14303,7 @@ var DataSource;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             reqParams = 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;
             }
@@ -14286,7 +14339,7 @@ var DataSource;
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
             reqParams = 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;
             }
@@ -14364,7 +14417,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "4.9.7";
+const VERSION = "4.9.9";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, GeoJson, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityTypeVisualSettings, EntityAttribute, EntityHistoricData, EntityTableView, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, AccountFeatures, AccountLimits, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportAssembly, ImportCad, ImportCsv, ImportJson, ImportGeoJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map