@webuildbots/webuildbots-sdk 11.1.1 → 11.2.0

package/lib/services/ResponseService.js

@@ -46,100 +46,145 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var __1 = require("..");
+var block_enums_1 = require("../const/block-enums");
+var form_data_builder_1 = require("../util/form-data-builder");
 var ApiService_1 = __importDefault(require("./ApiService"));
 var ResponseService = /** @class */ (function () {
     function ResponseService(token, client, rootURL) {
         this.apiService = new ApiService_1.default(token, rootURL);
         this.client = client;
     }
-    ResponseService.prototype.createResponse = function (title, module, description, type, name, group, variable, formFieldCallbackArgs, next) {
-        if (name === void 0) { name = __1.BlockBuilder.DEFAULT_NAME; }
-        if (group === void 0) { group = __1.BlockBuilder.DEFAULT_GROUP; }
+    ResponseService.prototype.formatBlockValues = function (block) {
+        var _a;
+        var functionObject = block.function;
+        var allFormValuesFlag = functionObject &&
+            (functionObject.useAllFormValues ||
+                functionObject.type === block_enums_1.FunctionTypes.LOGIC_BLOCK);
+        if ((_a = block === null || block === void 0 ? void 0 : block.function) === null || _a === void 0 ? void 0 : _a.name) {
+            var _b = block.function, name_1 = _b.name, otherValues = __rest(_b, ["name"]);
+            return __assign(__assign({}, block), { function: __assign({ name: name_1, useAllFormValues: allFormValuesFlag }, otherValues) });
+        }
+        if (functionObject) {
+            return __assign(__assign({}, block), { function: __assign(__assign({}, block.function), { useAllFormValues: allFormValuesFlag }) });
+        }
+        return block;
+    };
+    ResponseService.prototype.createResponse = function (content, module, description, type, name, group, formFieldCallbackArgs, next, functionObj) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var block, res, options, e_1;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var block, builder, formatedBody, blockValues, payload, _b, res, options, e_1;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         block = {
-                            name: name,
-                            type: type,
-                            group: group,
                             version: __1.BlockBuilder.VERSION,
-                            created: new Date(),
-                            content: {
-                                title: (_a = {}, _a[title.language] = title.value, _a)
-                            },
+                            created: new Date().toISOString(),
+                            content: content,
+                            type: type,
                             module: module,
                             meta: {
                                 description: description
                             },
-                            variables: [__assign({}, variable)],
+                            name: name,
                             formFieldCallback: formFieldCallbackArgs,
+                            function: functionObj,
+                            group: group,
                             next: next
                         };
+                        builder = form_data_builder_1.FormDataBuilder();
+                        formatedBody = __assign(__assign({}, block), { content: block.content ? block.content : {}, name: block.name ? block.name : __1.BlockBuilder.DEFAULT_NAME, group: block.group ? block.group : __1.BlockBuilder.DEFAULT_GROUP });
+                        blockValues = block.function
+                            ? this.formatBlockValues(formatedBody)
+                            : formatedBody;
+                        if (!((_a = block.content) === null || _a === void 0 ? void 0 : _a.items)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, builder.buildItems(blockValues)];
+                    case 1:
+                        _b = _c.sent();
+                        return [3 /*break*/, 4];
+                    case 2: return [4 /*yield*/, builder.buildBlock(blockValues)];
+                    case 3:
+                        _b = _c.sent();
+                        _c.label = 4;
+                    case 4:
+                        payload = _b;
                         options = {
                             method: 'POST',
-                            body: block,
+                            data: payload,
                             headers: { 'content-type': 'multipart/form-data' }
                         };
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 3, , 4]);
+                        _c.label = 5;
+                    case 5:
+                        _c.trys.push([5, 7, , 8]);
                         return [4 /*yield*/, this.apiService.hitApi('api/agent/block', this.client, options)];
-                    case 2:
-                        res = _b.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        e_1 = _b.sent();
+                    case 6:
+                        res = _c.sent();
+                        return [3 /*break*/, 8];
+                    case 7:
+                        e_1 = _c.sent();
                         throw Error(e_1);
-                    case 4: return [2 /*return*/, res];
+                    case 8: return [2 /*return*/, res];
                 }
             });
         });
     };
-    ResponseService.prototype.updateResponse = function (blockId, title, module, description, type, name, group, variable, formFieldCallbackArgs, next) {
+    ResponseService.prototype.updateResponse = function (blockId, body) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var res, options, e_2;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
+            var oldResponse, builder, content, formatedBody, blockValues, payload, _b, res, options, e_2;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0: return [4 /*yield*/, this.getResponse(blockId)];
+                    case 1:
+                        oldResponse = _c.sent();
+                        builder = form_data_builder_1.FormDataBuilder();
+                        content = body.content ? body.content : {};
+                        formatedBody = __assign(__assign({}, body), { _id: blockId, created: body.created || oldResponse[0].created, version: body.version || oldResponse[0].version, type: body.type || oldResponse[0].type, content: content });
+                        blockValues = body.function
+                            ? this.formatBlockValues(formatedBody)
+                            : formatedBody;
+                        if (!((_a = body.content) === null || _a === void 0 ? void 0 : _a.items)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, builder.buildItems(blockValues)];
+                    case 2:
+                        _b = _c.sent();
+                        return [3 /*break*/, 5];
+                    case 3: return [4 /*yield*/, builder.buildBlock(blockValues)];
+                    case 4:
+                        _b = _c.sent();
+                        _c.label = 5;
+                    case 5:
+                        payload = _b;
                         options = {
                             method: 'PUT',
-                            body: {
-                                name: name,
-                                type: type,
-                                group: group,
-                                content: {
-                                    title: (_a = {}, _a[title.language] = title.value, _a)
-                                },
-                                module: module,
-                                meta: {
-                                    description: description
-                                },
-                                variables: [__assign({}, variable)],
-                                formFieldCallback: formFieldCallbackArgs,
-                                next: next
-                            },
-                            headers: { 'content-type': 'multipart/form-data' }
+                            data: payload,
+                            headers: { 'Content-Type': 'multipart/form-data' }
                         };
-                        _b.label = 1;
-                    case 1:
-                        _b.trys.push([1, 3, , 4]);
+                        _c.label = 6;
+                    case 6:
+                        _c.trys.push([6, 8, , 9]);
                         return [4 /*yield*/, this.apiService.hitApi('api/agent/block/' + blockId, this.client, options)];
-                    case 2:
-                        res = _b.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        e_2 = _b.sent();
+                    case 7:
+                        res = _c.sent();
+                        return [3 /*break*/, 9];
+                    case 8:
+                        e_2 = _c.sent();
                         throw Error(e_2);
-                    case 4: return [2 /*return*/, res];
+                    case 9: return [2 /*return*/, res];
                 }
             });
         });
@@ -173,41 +218,46 @@ var ResponseService = /** @class */ (function () {
         if (types === void 0) { types = []; }
         if (groups === void 0) { groups = []; }
         return __awaiter(this, void 0, void 0, function () {
-            var res, query, _i, types_1, type, _a, groups_1, group, options, e_4;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var res, options, e_4;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        query = "?searchText=" + searchText;
-                        if (types.length) {
-                            for (_i = 0, types_1 = types; _i < types_1.length; _i++) {
-                                type = types_1[_i];
-                                query + ("&type[]=" + type);
-                            }
-                        }
-                        if (groups.length) {
-                            for (_a = 0, groups_1 = groups; _a < groups_1.length; _a++) {
-                                group = groups_1[_a];
-                                query + ("&group[]=" + group);
-                            }
-                        }
                         options = {
-                            method: 'GET'
+                            method: 'GET',
+                            params: {
+                                searchText: searchText,
+                                types: types,
+                                groups: groups
+                            }
                         };
-                        _b.label = 1;
+                        _a.label = 1;
                     case 1:
-                        _b.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.apiService.hitApi('api/agent/block/' + query, this.client, options)];
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.apiService.hitApi('api/agent/block', this.client, options)];
                     case 2:
-                        res = _b.sent();
+                        res = _a.sent();
                         return [3 /*break*/, 4];
                     case 3:
-                        e_4 = _b.sent();
+                        e_4 = _a.sent();
                         throw Error(e_4);
                     case 4: return [2 /*return*/, res];
                 }
             });
         });
     };
+    ResponseService.prototype.getResponse = function (id) {
+        return __awaiter(this, void 0, void 0, function () {
+            var allResponses;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getResponses()];
+                    case 1:
+                        allResponses = _a.sent();
+                        return [2 /*return*/, allResponses.data.filter(function (response) { return response._id == id; })];
+                }
+            });
+        });
+    };
     return ResponseService;
 }());
 exports.default = ResponseService;

package/lib/util/form-data-builder.d.ts

@@ -0,0 +1,9 @@
+import BlockObj from '../interfaces/block';
+import { BlockFormState } from '../interfaces/block-form-state';
+import FormData from 'form-data';
+export declare const FormDataBuilder: () => {
+    buildSingleImageForm: (obj: any, shouldUpdateAvatar?: boolean) => Promise<FormData>;
+    buildBlock: (blk: BlockObj | BlockFormState | any) => Promise<FormData>;
+    buildItems: (blk: BlockObj | BlockFormState) => Promise<FormData>;
+    buildSettings: (settings: any) => Promise<FormData>;
+};

package/lib/util/form-data-builder.js

@@ -0,0 +1,183 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormDataBuilder = void 0;
+var json_stringify_safe_1 = __importDefault(require("json-stringify-safe"));
+var form_data_1 = __importDefault(require("form-data"));
+var FormDataBuilder = function () {
+    var formData = new form_data_1.default();
+    var createBlob = function (imgData) { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!(typeof imgData === 'string')) return [3 /*break*/, 2];
+                    return [4 /*yield*/, fetch(imgData)];
+                case 1: return [2 /*return*/, (_a.sent()).blob()];
+                case 2: return [2 /*return*/, imgData];
+            }
+        });
+    }); };
+    var appendBlob = function (key, obj) { return __awaiter(void 0, void 0, void 0, function () {
+        var blob;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    if (!obj.imageBlob) return [3 /*break*/, 3];
+                    return [4 /*yield*/, createBlob(obj.imageBlob)];
+                case 1:
+                    blob = _b.sent();
+                    return [4 /*yield*/, formData.append(key, blob)];
+                case 2:
+                    _b.sent();
+                    _b.label = 3;
+                case 3:
+                    if (!((_a = obj.media) === null || _a === void 0 ? void 0 : _a.mediaFiles)) return [3 /*break*/, 5];
+                    // append media files
+                    return [4 /*yield*/, formData.append(key, obj.media.mediaFiles[0])];
+                case 4:
+                    // append media files
+                    _b.sent();
+                    _b.label = 5;
+                case 5: return [2 /*return*/];
+            }
+        });
+    }); };
+    var buildSingleImageForm = function (obj, shouldUpdateAvatar) {
+        if (shouldUpdateAvatar === void 0) { shouldUpdateAvatar = true; }
+        return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!shouldUpdateAvatar) return [3 /*break*/, 2];
+                        return [4 /*yield*/, appendBlob('upload', obj)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2:
+                        delete obj.imageBlob;
+                        formData.append('body', json_stringify_safe_1.default(obj));
+                        return [2 /*return*/, formData];
+                }
+            });
+        });
+    };
+    var buildSettings = function (settings) { return __awaiter(void 0, void 0, void 0, function () {
+        var blob, blob;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!settings.company.iconImageBlob) return [3 /*break*/, 3];
+                    return [4 /*yield*/, createBlob(settings.company.iconImageBlob)];
+                case 1:
+                    blob = _a.sent();
+                    return [4 /*yield*/, formData.append('uploadIcon', blob)];
+                case 2:
+                    _a.sent();
+                    delete settings.company.iconImageBlob;
+                    _a.label = 3;
+                case 3:
+                    if (!settings.company.logoImageBlob) return [3 /*break*/, 6];
+                    return [4 /*yield*/, createBlob(settings.company.logoImageBlob)];
+                case 4:
+                    blob = _a.sent();
+                    return [4 /*yield*/, formData.append('uploadLogo', blob)];
+                case 5:
+                    _a.sent();
+                    delete settings.company.logoImageBlob;
+                    _a.label = 6;
+                case 6:
+                    formData.append('body', json_stringify_safe_1.default(settings));
+                    return [2 /*return*/, formData];
+            }
+        });
+    }); };
+    var buildBlock = function (blk) { return __awaiter(void 0, void 0, void 0, function () {
+        var content;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    content = blk.content;
+                    return [4 /*yield*/, appendBlob('mediaFile', content)];
+                case 1:
+                    _a.sent();
+                    formData.append('body', json_stringify_safe_1.default(blk));
+                    return [2 /*return*/, formData];
+            }
+        });
+    }); };
+    var buildItems = function (blk) { return __awaiter(void 0, void 0, void 0, function () {
+        var content, _a, _b, _i, i, item;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    content = blk.content;
+                    _a = [];
+                    for (_b in content.items)
+                        _a.push(_b);
+                    _i = 0;
+                    _c.label = 1;
+                case 1:
+                    if (!(_i < _a.length)) return [3 /*break*/, 4];
+                    i = _a[_i];
+                    if (!content.items.hasOwnProperty(i)) return [3 /*break*/, 3];
+                    item = content.items[i];
+                    return [4 /*yield*/, appendBlob("uploadItemMedia" + i, item)];
+                case 2:
+                    _c.sent();
+                    _c.label = 3;
+                case 3:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 4:
+                    formData.append('body', json_stringify_safe_1.default(blk));
+                    return [2 /*return*/, formData];
+            }
+        });
+    }); };
+    return {
+        buildSingleImageForm: buildSingleImageForm,
+        buildBlock: buildBlock,
+        buildItems: buildItems,
+        buildSettings: buildSettings
+    };
+};
+exports.FormDataBuilder = FormDataBuilder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webuildbots/webuildbots-sdk",
-  "version": "11.1.1",
+  "version": "11.2.0",
   "description": "webuildbots sdk",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -53,10 +53,11 @@
   },
   "dependencies": {
     "@types/json-logic-js": "^1.2.1",
+    "axios": "^1.3.5",
     "bson-objectid": "^1.3.1",
-    "cross-fetch": "^3.1.5",
     "deep-equal": "^2.0.4",
     "flatted": "^3.1.0",
+    "form-data": "^3.0.1",
     "http-status-codes": "^2.1.4",
     "jsonwebtoken": "^8.5.1",
     "md5": "^2.3.0",