bruce-models 6.7.5 → 6.7.7

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.
@@ -11172,6 +11179,10 @@ var ProjectView;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
+            // Same thing but keeps cache keys consistent.
+            if (expand === true) {
+                expand = "*";
+            }
             const key = GetCacheKey(viewId, bookmarkId, expand);
             const cache = api.GetCacheItem(key, reqParams);
             if (cache === null || cache === void 0 ? void 0 : cache.found) {
@@ -11183,8 +11194,14 @@ var ProjectView;
                     if (viewId) {
                         url += viewId;
                     }
-                    else if (bookmarkId) {
+                    let added = false;
+                    if (bookmarkId) {
                         url += "?SlideID=" + encodeURIComponent(bookmarkId);
+                        added = true;
+                    }
+                    if (expand) {
+                        url += (added ? "&" : "?") + "Expand=" + encodeURIComponent(expand);
+                        added = true;
                     }
                     const data = yield api.GET(url, Api.PrepReqParams(reqParams));
                     res({
@@ -16442,7 +16459,7 @@ var Tracking;
 })(Tracking || (Tracking = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "6.7.5";
+const VERSION = "6.7.7";
 
 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