bruce-models 4.6.1 → 4.6.3

package/dist/bruce-models.umd.js

@@ -642,8 +642,21 @@
                 }
             }
             formatApiUri(uri) {
-                const ws = !window.document || window.document.location.protocol === "https:" ? "wss" : "ws";
-                return uri.replace(/^(https|http)/, ws) + "websocket";
+                const wsProtocol = window.document.location.protocol === "https:" ? "wss" : "ws";
+                const currentUrl = new URL(uri);
+                let full = wsProtocol + "://" + currentUrl.host + currentUrl.pathname + "websocket";
+                // Check if we have a queryParam for accountId.
+                const accountId = currentUrl.searchParams.get("accountId");
+                if (accountId) {
+                    if (full.includes("?")) {
+                        full += "&";
+                    }
+                    else {
+                        full += "?";
+                    }
+                    full += "accountId=" + accountId;
+                }
+                return full;
             }
             onOpen(ev) {
                 if (this.env === exports.Api.EEnv.DEV) {
@@ -1123,10 +1136,11 @@
                 if (!tmp.pathname.endsWith("/")) {
                     tmp.pathname += "/";
                 }
+                let split;
                 if (url) {
                     // Ensure we're only adding the path.
                     // The baseUrl could have included query params so have this extra logic.
-                    let split = url.split("?");
+                    split = url.split("?");
                     // Ensure the url does not start with a slash.
                     // This is because the base url already has a slash at the end.
                     let path = split[0];
@@ -1134,16 +1148,22 @@
                         path = url.substring(1);
                     }
                     tmp.pathname += path;
-                    // Append the query string if any exist.
-                    if (split.length > 1) {
-                        const query = split[1].split("&");
-                        for (let q of query) {
-                            const parts = q.split("=");
-                            tmp.searchParams.append(parts[0], parts[1]);
+                }
+                let full = tmp.toString();
+                // Append the query string if any exist.
+                if (split && split.length > 1) {
+                    const query = split[1].split("&");
+                    for (let q of query) {
+                        if (full.includes("?")) {
+                            full += "&";
                         }
+                        else {
+                            full += "?";
+                        }
+                        full += q;
                     }
                 }
-                return tmp.toString();
+                return full;
             }
             /**
              * Warning: This will cancel the init process.
@@ -3784,10 +3804,13 @@
                         urlParams.set("schema", schemaId);
                     }
                     urlParams.set("hasMigrated", String(Boolean(migrated)));
+                    let url = analysis ? "entities/summary" : "entities";
+                    // Adding url params here because this will avoid making them encoded.
+                    // Our API isn't decoding them properly so $expand is not being recognized.
+                    url += "?" + urlParams.toString();
                     const urlStr = api.ConstructUrl({
                         cdn: !analysis && viaCdn,
-                        url: analysis ? "entities/summary" : "entities",
-                        urlParams: urlParams
+                        url: url
                     });
                     const data = yield api.get(urlStr, exports.Api.PrepReqParams(reqParams));
                     if (!analysis) {
@@ -3807,10 +3830,13 @@
                         urlParams.set("schema", schemaId);
                     }
                     urlParams.set("hasMigrated", String(Boolean(migrated)));
+                    let url = analysis ? "entities/summary" : "entities";
+                    // Adding url params here because this will avoid making them encoded.
+                    // Our API isn't decoding them properly so $expand is not being recognized.
+                    url += "?" + urlParams.toString();
                     const urlStr = api.ConstructUrl({
                         cdn: false,
-                        url: analysis ? "entities/summary" : "entities",
-                        urlParams: urlParams
+                        url: url
                     });
                     const data = yield api.post(urlStr, body, exports.Api.PrepReqParams(reqParams));
                     if (!analysis) {
@@ -13497,7 +13523,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.6.1";
+    const VERSION = "4.6.3";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;