bruce-models 4.6.1 → 4.6.3

package/dist/bruce-models.es5.js

@@ -641,8 +641,21 @@ var MessageBroker;
             }
         }
         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 === Api.EEnv.DEV) {
@@ -1132,10 +1145,11 @@ var BruceApi;
             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];
@@ -1143,16 +1157,22 @@ var BruceApi;
                     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.
@@ -3829,10 +3849,13 @@ var Entity;
                     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, Api.PrepReqParams(reqParams));
                 if (!analysis) {
@@ -3852,10 +3875,13 @@ var Entity;
                     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, Api.PrepReqParams(reqParams));
                 if (!analysis) {
@@ -13768,7 +13794,7 @@ var DataSource;
 })(DataSource || (DataSource = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "4.6.1";
+const VERSION = "4.6.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, EntityHistoricData, EntityTableView, Comment, ClientFile, ProgramKey, ZoomControl, MenuItem, ProjectViewBookmark, ProjectView, ProjectViewLegacyTile, ProjectViewTile, ProjectViewLegacy, ProjectViewLegacyBookmark, PendingAction, MessageBroker, HostingLocation, Style, Tileset, Permission, Session, UserGroup, User, Account, AccountInvite, AccountFeatures, AccountLimits, EncryptUtils, MathUtils, ObjectUtils, PathUtils, UrlUtils, DataLab, ImportCad, ImportCsv, ImportJson, ImportKml, ImportedFile, Markup, Uploader, Plugin, ENVIRONMENT, DataSource };
 //# sourceMappingURL=bruce-models.es5.js.map