bruce-models 6.7.6 → 6.7.8

package/dist/bruce-models.es5.js

@@ -985,7 +985,7 @@ var BruceApi;
             // Indicates if the init process has finished loading.
             // While this is not resolved requests will be in a pending state.
             this.loadProm = Promise.resolve();
-            let { accountId, env, guardian, loadRegionalBaseUrl, loadConfig, loadWebSocket, dummy } = params;
+            let { accountId, env, guardian, loadRegionalBaseUrl, loadConfig, loadWebSocket, dummy, account } = params;
             this.accountId = accountId;
             this.env = env !== null && env !== void 0 ? env : Api.EEnv.PROD;
             if (!dummy) {
@@ -997,16 +997,20 @@ var BruceApi;
                     // Mark it as attempted right away because we don't want any external calls while it gets to that async point.
                     this.configLoadAttempted = true;
                 }
-                this.loadProm = this.init(guardian, loadConfig, loadWebSocket);
+                this.loadProm = this.init(guardian, loadConfig, loadWebSocket, account);
             }
         }
         /**
          * Loads regional base url and sets up message broker.
          * @param guardian Required for loading regional base url.
          * @param loadConfig
+         * @param loadWebSocket
+         * @param account
          * @returns
          */
-        init(guardian, loadConfig, loadWebSocket) {
+        init(guardian, loadConfig, loadWebSocket, 
+        // Preloaded account to save doing an API call.
+        account) {
             return __awaiter(this, void 0, void 0, function* () {
                 if (!this.accountId) {
                     throw ("accountId is required.");
@@ -1020,7 +1024,8 @@ var BruceApi;
                         guardian: guardian,
                         // We marked it as attempted to load outside this method to fight any external calls.
                         // So we'll force load it now.
-                        forceLoad: true
+                        forceLoad: true,
+                        account: account
                     });
                 }
                 // Get the version.
@@ -1075,7 +1080,7 @@ var BruceApi;
          */
         LoadConfig(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { guardian, forceLoad } = (params !== null && params !== void 0 ? params : {});
+                let { guardian, forceLoad, account } = (params !== null && params !== void 0 ? params : {});
                 if (this.configLoadAttempted && forceLoad != true) {
                     return;
                 }
@@ -1086,10 +1091,12 @@ var BruceApi;
                             env: this.env
                         });
                     }
-                    const { account } = yield Account.GetBySubdomain({
-                        subdomain: this.accountId,
-                        api: guardian
-                    });
+                    if (!account) {
+                        account = (yield Account.GetBySubdomain({
+                            subdomain: this.accountId,
+                            api: guardian
+                        })).account;
+                    }
                     if (!this.loadCancelled) {
                         // Set the calculated base url.
                         // If this is not available then this is considered a critical failure.
@@ -12049,18 +12056,29 @@ var Account;
      */
     function Get(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { api, accountId: id, req: reqParams } = params;
+            let { api, accountId: id, req: reqParams, expand, appId } = params;
             if (!api) {
                 api = ENVIRONMENT.Api().GetGuardianApi();
             }
-            const cacheKey = GetCacheKey(api.GetSessionId(), id);
+            const expandParam = (expand === null || expand === void 0 ? void 0 : expand.length) ? expand.join(",") : undefined;
+            const cacheKey = GetCacheKey(api.GetSessionId(), id, appId, expandParam);
             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(`accountbyid/${id}`, reqParams);
+                    let url = `accountbyid/${id}`;
+                    let added = false;
+                    if (expandParam) {
+                        url += (added ? "&" : "?") + `Expand=${expandParam}`;
+                        added = true;
+                    }
+                    if (appId) {
+                        url += (added ? "&" : "?") + `App=${encodeURIComponent(appId)}`;
+                        added = true;
+                    }
+                    const data = yield api.GET(url, 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) {
                         api.SetCacheItem({
@@ -12088,6 +12106,7 @@ var Account;
     Account.Get = Get;
     /**
      * Returns a client account record by subdomain or ID.
+     * @deprecated use Get() as both will check against ID and subdomain.
      * @param params
      * @returns
      */
@@ -12297,16 +12316,22 @@ var Account;
      * @param sessionId
      * @param accountId
      * @param appSettingsId
+     * @param expandParam Comma delimited list of expand params.
      * @returns
      */
-    function GetCacheKey(sessionId, accountId, appSettingsId) {
+    function GetCacheKey(sessionId, accountId, appSettingsId, expandParam) {
         if (!sessionId) {
             sessionId = "anonymous";
         }
+        let cacheKey = [Api.ECacheKey.Account + Api.ECacheKey.Id + accountId];
+        if (expandParam) {
+            cacheKey.push(Api.ECacheKey.Id + expandParam);
+        }
         if (appSettingsId) {
-            return Api.ECacheKey.Account + Api.ECacheKey.Id + accountId + Api.ECacheKey + appSettingsId + Api.ECacheKey.Session + Api.ECacheKey.Id + sessionId;
+            cacheKey.push(Api.ECacheKey + appSettingsId);
         }
-        return Api.ECacheKey.Account + Api.ECacheKey.Id + accountId + Api.ECacheKey.Session + Api.ECacheKey.Id + sessionId;
+        cacheKey.push(Api.ECacheKey.Session + Api.ECacheKey.Id + sessionId);
+        return cacheKey.join("");
     }
     Account.GetCacheKey = GetCacheKey;
     /**
@@ -16452,7 +16477,7 @@ var Tracking;
 })(Tracking || (Tracking = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "6.7.6";
+const VERSION = "6.7.8";
 
 export { VERSION, Assembly, 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, EntityAttribute, EntityHistoricData, EntityTableView, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, ProjectViewBookmarkGroup, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, UserMfaMethod, Account, AccountInvite, AccountFeatures, AccountLimits, AccountTemplate, AccountType, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, DataLabGroup, ImportAssembly, ImportCad, ImportCsv, ImportJson, ImportGeoJson, ImportKml, ImportedFile, ExportBrz, ExportUsd, Markup, Uploader, Plugin, ENVIRONMENT, DataSource, Scenario, Tracking };
 //# sourceMappingURL=bruce-models.es5.js.map