bruce-models 5.6.8 → 5.7.0

package/dist/bruce-models.es5.js

@@ -550,12 +550,6 @@ class AbstractApi {
             if (this.ssidHeader) {
                 params.headers[this.ssidHeader] = this.GetSessionId();
             }
-            /**
-             * If we support the legacy request and need it for progress, then we diverge there.
-             */
-            if (window && window["XMLHttpRequest"] && params.onProgress) {
-                return legacyUpload(url, blob, params);
-            }
             const formData = params.formData instanceof FormData ? params.formData : new FormData();
             if (formData.has("file")) {
                 formData.delete("file");
@@ -567,6 +561,12 @@ class AbstractApi {
                     formData.append(key, params.formData[key]);
                 }
             }
+            /**
+             * If we support the legacy request and need it for progress, then we diverge there.
+             */
+            if (window && window["XMLHttpRequest"] && params.onProgress) {
+                return legacyUpload(url, params.headers, formData, params.onProgress, params.abortSignal);
+            }
             const res = yield fetch(url, {
                 headers: params.headers,
                 method: "POST",
@@ -582,34 +582,26 @@ class AbstractApi {
  * Unfortunately, this is needed to track progress when it's supported.
  * Fetch doesn't have this capability.
  * @param url
- * @param blob
  * @param params
  */
-function legacyUpload(url, blob, params) {
-    params = Object.assign({}, params);
-    params.headers = Object.assign({}, params.headers);
-    const formData = new FormData();
-    formData.append("file", blob);
-    if (params.formData && !(params.formData instanceof FormData)) {
-        for (let key in params.formData) {
-            if (key !== "file") {
-                formData.append(key, params.formData[key]);
-            }
-        }
-    }
+function legacyUpload(url, headers, formData, onProgress, abortSignal) {
     return new Promise((resolve, reject) => {
         const xhr = new window["XMLHttpRequest"]();
         xhr.open("POST", url, true);
         // Set custom headers.
-        if (params.headers) {
-            Object.entries(params.headers).forEach(([key, value]) => {
+        if (headers) {
+            Object.keys(headers).forEach((key) => {
+                let value = headers[key];
+                if (!value) {
+                    value = "";
+                }
                 xhr.setRequestHeader(key, value);
             });
         }
         // Progress event.
         xhr.upload.onprogress = (event) => {
-            if ((params === null || params === void 0 ? void 0 : params.onProgress) && event.lengthComputable) {
-                params.onProgress(event);
+            if (onProgress && event.lengthComputable) {
+                onProgress(event);
             }
         };
         // Success and error handling.
@@ -622,8 +614,8 @@ function legacyUpload(url, blob, params) {
             }
         };
         xhr.onerror = () => reject(new Error("Network error occurred during file upload."));
-        if (params.abortSignal) {
-            params.abortSignal.addEventListener("abort", () => {
+        if (abortSignal) {
+            abortSignal.addEventListener("abort", () => {
                 xhr.abort();
                 reject(new Error("Upload aborted."));
             });
@@ -8436,7 +8428,7 @@ var Uploader;
             if (!api) {
                 api = ENVIRONMENT.Api().GetBruceApi();
             }
-            const FILE_PORTION_SIZE = 100000000; // 100MB.
+            const FILE_PORTION_SIZE = 50000000; // 50MB.
             let fileSize = file.size;
             let fileOffset = 0;
             let filePartsCount = fileSize / FILE_PORTION_SIZE;
@@ -15271,7 +15263,7 @@ var Scenario;
 })(Scenario || (Scenario = {}));
 
 // This is updated with the package.json version on build.
-const VERSION = "5.6.8";
+const VERSION = "5.7.0";
 
 export { VERSION, 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, 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 };
 //# sourceMappingURL=bruce-models.es5.js.map