From 4b75ffbf67fa72fd4dbd37c526a6b3d8619db48f Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Mon, 22 Mar 2021 16:09:30 +0100 Subject: [PATCH] start helper migration --- zero.Web.UI/App/helpers/all.js | 2 + zero.Web.UI/app/api/countries.js | 5 +- zero.Web.UI/app/helpers/request.js | 206 ------------------------- zero.Web.UI/app/helpers/request.js.map | 1 - 4 files changed, 5 insertions(+), 209 deletions(-) create mode 100644 zero.Web.UI/App/helpers/all.js delete mode 100644 zero.Web.UI/app/helpers/request.js delete mode 100644 zero.Web.UI/app/helpers/request.js.map diff --git a/zero.Web.UI/App/helpers/all.js b/zero.Web.UI/App/helpers/all.js new file mode 100644 index 00000000..30a93b01 --- /dev/null +++ b/zero.Web.UI/App/helpers/all.js @@ -0,0 +1,2 @@ + +export * as RequestHelper from './request.ts'; \ No newline at end of file diff --git a/zero.Web.UI/app/api/countries.js b/zero.Web.UI/app/api/countries.js index 9158b78e..fd723b2f 100644 --- a/zero.Web.UI/app/api/countries.js +++ b/zero.Web.UI/app/api/countries.js @@ -1,3 +1,4 @@ -import { collection } from '../helpers/request.ts'; +//import { collection } from '../helpers/request.ts'; +import { RequestHelper } from '../helpers/all.js'; -export default { ...collection('countries/') }; \ No newline at end of file +export default { ...RequestHelper.collection('countries/') }; \ No newline at end of file diff --git a/zero.Web.UI/app/helpers/request.js b/zero.Web.UI/app/helpers/request.js deleted file mode 100644 index cb17999c..00000000 --- a/zero.Web.UI/app/helpers/request.js +++ /dev/null @@ -1,206 +0,0 @@ -"use strict"; -var __assign = (this && this.__assign) || function () { - __assign = Object.assign || function(t) { - for (var s, i = 1, n = arguments.length; i < n; i++) { - s = arguments[i]; - for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) - t[p] = s[p]; - } - return t; - }; - return __assign.apply(this, arguments); -}; -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 }; - } -}; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.collection = exports.send = exports.patch = exports.put = exports.del = exports.post = exports.get = void 0; -var axios_1 = require("axios"); -var getConfig = function (config) { - config = config || {}; - if (config.scope) { - config.params = config.params || {}; - config.params.scope = config.scope; - } - return config; -}; -function get(url, config) { - if (config === void 0) { config = null; } - return __awaiter(this, void 0, void 0, function () { - return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, send(__assign({ method: 'get', url: url }, config))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); - }); -} -exports.get = get; -function post(url, data, config) { - if (data === void 0) { data = null; } - if (config === void 0) { config = null; } - return __awaiter(this, void 0, void 0, function () { - return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, send(__assign({ method: 'post', url: url, data: data }, config))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); - }); -} -exports.post = post; -function del(url, config) { - if (config === void 0) { config = null; } - return __awaiter(this, void 0, void 0, function () { - return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, send(__assign({ method: 'delete', url: url }, config))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); - }); -} -exports.del = del; -function put(url, data, config) { - if (data === void 0) { data = null; } - if (config === void 0) { config = null; } - return __awaiter(this, void 0, void 0, function () { - return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, send(__assign({ method: 'put', url: url, data: data }, config))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); - }); -} -exports.put = put; -function patch(url, data, config) { - if (data === void 0) { data = null; } - if (config === void 0) { config = null; } - return __awaiter(this, void 0, void 0, function () { - return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, send(__assign({ method: 'patch', url: url, data: data }, config))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); - }); -} -exports.patch = patch; -function send(config) { - return __awaiter(this, void 0, void 0, function () { - var result, err_1; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - config = getConfig(config); - _a.label = 1; - case 1: - _a.trys.push([1, 3, , 4]); - return [4 /*yield*/, axios_1.default(config)]; - case 2: - result = _a.sent(); - return [2 /*return*/, result.data]; - case 3: - err_1 = _a.sent(); - return [3 /*break*/, 4]; - case 4: return [2 /*return*/]; - } - }); - }); -} -exports.send = send; -function collection(base) { - var _this = this; - return { - getById: function (id, config) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, get(base + 'getById', __assign(__assign({}, config), { params: { id: id } }))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); }); }, - getByIds: function (ids, config) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, get(base + 'getByIds', __assign(__assign({}, config), { params: { ids: ids } }))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); }); }, - getEmpty: function (config) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, get(base + 'getEmpty', __assign({}, config))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); }); }, - getByQuery: function (query, config) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, get(base + 'getByQuery', __assign(__assign({}, config), { params: { query: query } }))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); }); }, - getAll: function (config) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, get(base + 'getAll', __assign({}, config))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); }); }, - getPreviews: function (ids, config) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, get(base + 'getPreviews', __assign(__assign({}, config), { params: { ids: ids } }))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); }); }, - getForPicker: function (config) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, get(base + 'getForPicker', __assign({}, config))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); }); }, - save: function (model, config) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, post(base + 'save', model, __assign({}, config))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); }); }, - delete: function (id, config) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) { - switch (_a.label) { - case 0: return [4 /*yield*/, del(base + 'delete', __assign(__assign({}, config), { params: { id: id } }))]; - case 1: return [2 /*return*/, _a.sent()]; - } - }); }); } - }; -} -exports.collection = collection; -//# sourceMappingURL=request.js.map \ No newline at end of file diff --git a/zero.Web.UI/app/helpers/request.js.map b/zero.Web.UI/app/helpers/request.js.map deleted file mode 100644 index 91625ad4..00000000 --- a/zero.Web.UI/app/helpers/request.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"request.js","sourceRoot":"","sources":["request.ts"],"names":[],"mappings":"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"} \ No newline at end of file