bruce-models 3.3.1 → 3.3.3

package/dist/bruce-models.es5.js

@@ -883,19 +883,77 @@ var Account;
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
                 return cache.data;
             }
-            const req = yield api.GET(`account/${id}`, reqParams);
-            const resData = {
-                account: req
-            };
+            const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    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({
+                            key: data.Subdomain,
+                            value: prom,
+                            req: reqParams
+                        });
+                    }
+                    res({
+                        account: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
             yield api.SetCacheItem({
                 key: GetCacheKey(id),
-                value: resData,
+                value: prom,
                 req: reqParams
             });
-            return resData;
+            return prom;
         });
     }
     Account.Get = Get;
+    /**
+     * Returns a client account record by subdomain or ID.
+     * @param params
+     * @returns
+     */
+    function GetBySubdomain(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { api, subdomain, req: reqParams } = params;
+            if (!api) {
+                api = ENVIRONMENT.Api().GetGuardianApi();
+            }
+            const cache = yield api.GetCacheItem(GetCacheKey(subdomain), 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(`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({
+                            key: data.ID,
+                            value: prom,
+                            req: reqParams
+                        });
+                    }
+                    res({
+                        account: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            yield api.SetCacheItem({
+                key: GetCacheKey(subdomain),
+                value: prom,
+                req: reqParams
+            });
+            return prom;
+        });
+    }
+    Account.GetBySubdomain = GetBySubdomain;
     /**
      * Gets a list of client accounts related to the current session user.
      * @param params
@@ -2770,7 +2828,7 @@ var Entity;
      */
     function GetListByIds(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, entityIds, req: reqParams, expandRelations } = params;
+            let { api, entityIds, req: reqParams, expandRelations, expandLocation } = params;
             if (!entityIds.length) {
                 throw ("Entity IDs are required.");
             }
@@ -2781,7 +2839,7 @@ var Entity;
             const reqIds = [];
             for (let i = 0; i < entityIds.length; i++) {
                 const entityId = entityIds[i];
-                const key = GetCacheKey({ entityId, expandRelations });
+                const key = GetCacheKey({ entityId, expandRelations, expandLocation });
                 const cache = api.GetCacheItem(key, reqParams);
                 if (cache === null || cache === void 0 ? void 0 : cache.found) {
                     reqs.push(cache.data);
@@ -2798,15 +2856,17 @@ var Entity;
                 },
                 PageSize: reqIds.length
             };
+            if (expandRelations) {
+                reqData["Expand"] = "relation";
+            }
+            else if (expandLocation) {
+                reqData["Expand"] = "location";
+            }
             if (reqIds.length > 0) {
-                const urlParams = new URLSearchParams();
-                if (expandRelations) {
-                    urlParams.append("$expand", "relation");
-                }
-                const req = api.POST("entities?" + urlParams.toString(), reqData, Api.PrepReqParams(reqParams));
+                const req = api.POST("entities", reqData, Api.PrepReqParams(reqParams));
                 for (let i = 0; i < reqIds.length; i++) {
                     const entityId = reqIds[i];
-                    const key = GetCacheKey({ entityId });
+                    const key = GetCacheKey({ entityId, expandLocation, expandRelations });
                     const prom = new Promise((res) => __awaiter(this, void 0, void 0, function* () {
                         try {
                             const data = yield req;
@@ -10622,7 +10682,7 @@ var DataSource;
     DataSource.GetList = GetList;
 })(DataSource || (DataSource = {}));
 
-const VERSION = "3.3.1";
+const VERSION = "3.3.3";
 
 export { VERSION, AnnDocument, CustomForm, AbstractApi, Api, BruceApi, GlobalApi, GuardianApi, ApiGetters, Calculator, Bounds, BruceEvent, CacheControl, Camera, Cartes, Carto, Color, DelayQueue, Geometry, UTC, BruceVariable, LRUCache, EntityAttachmentType, EntityAttachment, EntityComment, EntityLink, EntityLod, EntityLodCategory, EntityRelationType, EntityRelation, EntitySource, EntityTag, EntityType, Entity, EntityCoords, EntityTypeVisualSettings, EntityAttribute, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map