bruce-models 4.8.1 → 4.8.3

package/dist/bruce-models.umd.js

@@ -531,65 +531,27 @@
          */
         upload(url, blob, params) {
             return __awaiter(this, void 0, void 0, function* () {
-                return new Promise((res, rej) => {
-                    try {
-                        let xhr = new XMLHttpRequest();
-                        const headers = params === null || params === void 0 ? void 0 : params.headers;
-                        if (headers) {
-                            const headerKeys = Object.keys(headers);
-                            for (let i = 0; i < headerKeys.length; i++) {
-                                const key = headerKeys[i];
-                                const value = headers[key];
-                                xhr.setRequestHeader(key, value);
-                            }
-                        }
-                        if (params === null || params === void 0 ? void 0 : params.onProgress) {
-                            if (xhr.upload) {
-                                xhr.upload.onprogress = params === null || params === void 0 ? void 0 : params.onProgress;
-                            }
-                            else {
-                                xhr.addEventListener("progress", params === null || params === void 0 ? void 0 : params.onProgress);
-                            }
-                        }
-                        xhr.onreadystatechange = (e) => {
-                            if (xhr.readyState == 4) {
-                                if (xhr.status >= 400 || xhr.status < 200) {
-                                    rej(e);
-                                }
-                                else {
-                                    try {
-                                        res(JSON.parse(xhr.responseText));
-                                    }
-                                    catch (e) {
-                                        console.error(e, xhr.responseText);
-                                        res(xhr.responseText);
-                                    }
-                                }
-                            }
-                        };
-                        xhr.open("POST", url, true);
-                        if (this.ssidHeader && this.ssid) {
-                            xhr.setRequestHeader(this.ssidHeader, this.ssid);
-                        }
-                        let formData;
-                        if ((params === null || params === void 0 ? void 0 : params.formData) instanceof FormData) {
-                            formData = params === null || params === void 0 ? void 0 : params.formData;
-                        }
-                        else {
-                            formData = new FormData();
-                            if (params === null || params === void 0 ? void 0 : params.formData) {
-                                for (const key in params.formData) {
-                                    formData.append(key, params.formData[key]);
-                                }
-                            }
-                        }
-                        formData.append("file", blob);
-                        xhr.send(formData);
-                    }
-                    catch (e) {
-                        rej(e);
+                if (!params) {
+                    params = {};
+                }
+                params.headers = params.headers || {};
+                params.headers = Object.assign({}, params.headers);
+                if (this.ssidHeader && this.ssid) {
+                    params.headers[this.ssidHeader] = this.ssid;
+                }
+                const formData = new FormData();
+                formData.append("file", blob);
+                if (params === null || params === void 0 ? void 0 : params.formData) {
+                    for (const key in params.formData) {
+                        formData.append(key, params.formData[key]);
                     }
+                }
+                const res = yield fetch(url, {
+                    headers: params.headers,
+                    method: "POST",
+                    body: formData
                 });
+                return parseResult(res);
             });
         }
     }
@@ -2559,21 +2521,24 @@
          */
         function ReIndex(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, entityTypeId: typeId, req } = params;
-                if (!typeId) {
-                    throw ("Type ID is required.");
-                }
+                let { api, entityTypeId: typeId, req, dataTransformId, reSaveAll } = params;
                 if (!api) {
                     api = exports.ENVIRONMENT.Api().GetBruceApi();
                 }
                 const urlParams = new URLSearchParams();
-                if (params.dataTransformId) {
-                    urlParams.append("dataTransformID", String(params.dataTransformId));
+                if (dataTransformId) {
+                    urlParams.append("dataTransformID", String(dataTransformId));
+                }
+                if (reSaveAll) {
+                    urlParams.append("reSaveAll", "true");
                 }
-                const url = `entitytype/${typeId}/reindex?${urlParams.toString()}`;
+                let url = typeId ? `entityType/${typeId}/reindex` : "entities/reindex";
+                url += "?" + urlParams.toString();
                 req = exports.Api.PrepReqParams(req);
-                const pa = yield api.POST(url, {}, req);
-                return pa;
+                const res = yield api.POST(url, {}, req);
+                return {
+                    pendingActionId: res.PendingActionID
+                };
             });
         }
         EntityType.ReIndex = ReIndex;
@@ -10574,7 +10539,7 @@
          */
         function OnCompletion(params) {
             return __awaiter(this, void 0, void 0, function* () {
-                let { api, actionId, req: reqParams, interval: intMs, isDisposed } = params;
+                let { api, actionId, req: reqParams, interval: intMs, isDisposed, onMessage } = params;
                 if (!actionId) {
                     throw ("Action ID is required.");
                 }
@@ -10584,10 +10549,43 @@
                 if (!intMs || intMs <= 0) {
                     intMs = 3000;
                 }
+                // Map of found messages.
+                const returnedMsgs = new Map();
+                const returnedMsgsArr = [];
                 const res = yield new Promise((res, rej) => {
+                    let msgInterval = null;
+                    if (onMessage != null) {
+                        msgInterval = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                            try {
+                                const { messages } = yield GetMessages({
+                                    api,
+                                    actionId,
+                                    order: exports.Api.ESortOrder.Desc,
+                                    startIndex: 0,
+                                    amount: 5
+                                });
+                                for (let i = 0; i < messages.length; i++) {
+                                    const message = messages[i];
+                                    // If this is a new message we'll notify the callback.
+                                    // We'll also add it to the map so we don't notify it again, and to return it later.
+                                    if (!returnedMsgs.has(message.ID)) {
+                                        returnedMsgs.set(message.ID, true);
+                                        returnedMsgsArr.push(message);
+                                        onMessage(message);
+                                    }
+                                }
+                            }
+                            catch (e) {
+                                clearInterval(msgInterval);
+                            }
+                        }), 1000);
+                    }
                     let interval = setInterval(() => __awaiter(this, void 0, void 0, function* () {
                         if (isDisposed && isDisposed()) {
                             clearInterval(interval);
+                            if (msgInterval) {
+                                clearInterval(msgInterval);
+                            }
                             res(null);
                         }
                         try {
@@ -10598,16 +10596,41 @@
                             });
                             if (action.Status !== EStatus.InProgress) {
                                 clearInterval(interval);
+                                if (msgInterval) {
+                                    clearInterval(msgInterval);
+                                }
                                 res(action);
                             }
                         }
                         catch (e) {
+                            clearInterval(interval);
+                            if (msgInterval) {
+                                clearInterval(msgInterval);
+                            }
                             rej(e);
                         }
                     }), intMs);
                 });
+                // Gather latest 30 messages.
+                if (!isDisposed || !isDisposed()) {
+                    const { messages } = yield GetMessages({
+                        api,
+                        actionId,
+                        order: exports.Api.ESortOrder.Desc,
+                        startIndex: 0,
+                        amount: 30
+                    });
+                    for (let i = 0; i < messages.length; i++) {
+                        const message = messages[i];
+                        if (!returnedMsgs.has(message.ID)) {
+                            returnedMsgs.set(message.ID, true);
+                            returnedMsgsArr.push(message);
+                        }
+                    }
+                }
                 return {
-                    action: res
+                    action: res,
+                    messages: returnedMsgsArr
                 };
             });
         }
@@ -13980,7 +14003,7 @@
     })(exports.DataSource || (exports.DataSource = {}));
 
     // This is updated with the package.json version on build.
-    const VERSION = "4.8.1";
+    const VERSION = "4.8.3";
 
     exports.VERSION = VERSION;
     exports.AbstractApi = AbstractApi;