bruce-models 6.7.5 → 6.7.7

package/dist/bruce-models.umd.js

@@ -976,7 +976,7 @@
                 // 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 : exports.Api.EEnv.PROD;
                 if (!dummy) {
@@ -988,16 +988,20 @@
                         // 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.");
@@ -1011,7 +1015,8 @@
                             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.
@@ -1066,7 +1071,7 @@
              */
             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;
                     }
@@ -1077,10 +1082,12 @@
                                 env: this.env
                             });
                         }
-                        const { account } = yield exports.Account.GetBySubdomain({
-                            subdomain: this.accountId,
-                            api: guardian
-                        });
+                        if (!account) {
+                            account = (yield exports.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.
@@ -10972,6 +10979,10 @@
                 if (!api) {
                     api = exports.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) {
@@ -10983,8 +10994,14 @@
                         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, exports.Api.PrepReqParams(reqParams));
                         res({
@@ -16127,7 +16144,7 @@
     })(exports.Tracking || (exports.Tracking = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "6.7.5";
+    const VERSION = "6.7.7";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;