@escapenavigator/services 1.1.3 → 1.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/index.js +1 -1
- package/dist/api/init-client-api.d.ts +2 -3
- package/dist/api/init-client-api.js +30 -34
- package/dist/hooks/use-api-method/index.js +9 -9
- package/dist/utils/get-service-error.js +2 -2
- package/dist/utils/is-network-error.js +1 -1
- package/dist/utils/serialize-record.js +1 -1
- package/dist/utils/validate-by-dto.js +1 -1
- package/package.json +7 -5
package/dist/api/index.js
CHANGED
|
@@ -26,7 +26,7 @@ function initApi(apiDeclaration, baseURL) {
|
|
|
26
26
|
axiosConfig = Object.assign(Object.assign({}, axiosConfig), { baseURL, withCredentials: true });
|
|
27
27
|
// console.log({ axiosConfig });
|
|
28
28
|
try {
|
|
29
|
-
const result = yield axios_1.default(axiosConfig);
|
|
29
|
+
const result = yield (0, axios_1.default)(axiosConfig);
|
|
30
30
|
return result;
|
|
31
31
|
}
|
|
32
32
|
catch (error) {
|
|
@@ -28,7 +28,7 @@ import { userMessagesApiDeclaration } from './user-messages-api';
|
|
|
28
28
|
import { usersApiDeclaration } from './users-api';
|
|
29
29
|
import { widgetsApiDeclaration } from './widgets-api';
|
|
30
30
|
import { Api } from '.';
|
|
31
|
-
declare type InitApiDeclaration = {
|
|
31
|
+
export declare type InitApiDeclaration = {
|
|
32
32
|
admins: Api<typeof adminsApiDeclaration>;
|
|
33
33
|
uploads: Api<typeof uploadsApiDeclaration>;
|
|
34
34
|
emails: Api<typeof emailsApiDeclaration>;
|
|
@@ -59,5 +59,4 @@ declare type InitApiDeclaration = {
|
|
|
59
59
|
support: Api<typeof supportApiDeclaration>;
|
|
60
60
|
registrationRequests: Api<typeof registrationRequestsApiDeclaration>;
|
|
61
61
|
};
|
|
62
|
-
export declare const initClientApi: (
|
|
63
|
-
export {};
|
|
62
|
+
export declare const initClientApi: (url: string) => InitApiDeclaration;
|
|
@@ -31,41 +31,37 @@ const user_messages_api_1 = require("./user-messages-api");
|
|
|
31
31
|
const users_api_1 = require("./users-api");
|
|
32
32
|
const widgets_api_1 = require("./widgets-api");
|
|
33
33
|
const _1 = require(".");
|
|
34
|
-
const initClientApi = (
|
|
35
|
-
const url = baseURL
|
|
36
|
-
|| (process === null || process === void 0 ? void 0 : process.env.REACT_APP_API_URL)
|
|
37
|
-
|| (process === null || process === void 0 ? void 0 : process.env.NEXT_PUBLIC_API_URL)
|
|
38
|
-
|| 'http://localhost:9999';
|
|
34
|
+
const initClientApi = (url) => {
|
|
39
35
|
return {
|
|
40
|
-
agbs: _1.initApi(agb_api_1.agbApiDeclaration, url),
|
|
41
|
-
uploads: _1.initApi(uploads_api_1.uploadsApiDeclaration, url),
|
|
42
|
-
emails: _1.initApi(emails_api_1.emailsApiDeclaration, url),
|
|
43
|
-
admins: _1.initApi(admins_api_1.adminsApiDeclaration, url),
|
|
44
|
-
userMessages: _1.initApi(user_messages_api_1.userMessagesApiDeclaration, url),
|
|
45
|
-
orderDiscounts: _1.initApi(order_discounts_api_1.orderDiscountsApiDeclaration, url),
|
|
46
|
-
orderPenalties: _1.initApi(order_penalties_api_1.orderPenaltiesApiDeclaration, url),
|
|
47
|
-
orderUpsellngs: _1.initApi(order_upsellings_api_1.orderUpsellngsApiDeclaration, url),
|
|
48
|
-
slots: _1.initApi(slots_api_1.slotsApiDeclaration, url),
|
|
49
|
-
slotTemplates: _1.initApi(slot_templates_api_1.slotTemplatesApiDeclaration, url),
|
|
50
|
-
orders: _1.initApi(orders_api_1.ordersApiDeclaration, url),
|
|
51
|
-
cashboxes: _1.initApi(cashboxes_api_1.cashboxesApiDeclaration, url),
|
|
52
|
-
certificates: _1.initApi(certificates_api_1.certificatesApiDeclaration, url),
|
|
53
|
-
financeItems: _1.initApi(financeitems_api_1.financeItemsApiDeclaration, url),
|
|
54
|
-
locations: _1.initApi(locations_api_1.locationsApiDeclaration, url),
|
|
55
|
-
upsellings: _1.initApi(upsellings_api_1.upsellingsApiDeclaration, url),
|
|
56
|
-
partners: _1.initApi(partners_api_1.partnersApiDeclaration, url),
|
|
57
|
-
questrooms: _1.initApi(questrooms_api_1.questroomsApiDeclaration, url),
|
|
58
|
-
widgets: _1.initApi(widgets_api_1.widgetsApiDeclaration, url),
|
|
59
|
-
profiles: _1.initApi(profiles_api_1.profilesApiDeclaration, url),
|
|
60
|
-
users: _1.initApi(users_api_1.usersApiDeclaration, url),
|
|
61
|
-
clients: _1.initApi(clients_api_1.clientsApiDeclaration, url),
|
|
62
|
-
transactions: _1.initApi(transactions_api_1.transactionsApiDeclaration, url),
|
|
63
|
-
images: _1.initApi(images_api_1.imagesApiDeclaration, url),
|
|
64
|
-
roles: _1.initApi(roles_api_1.rolesApiDeclaration, url),
|
|
65
|
-
tariffs: _1.initApi(tariffs_api_1.tariffsApiDeclaration, url),
|
|
66
|
-
certificatesales: _1.initApi(certificatesales_api_1.certificateSalesApiDeclaration, url),
|
|
67
|
-
support: _1.initApi(support_1.supportApiDeclaration, url),
|
|
68
|
-
registrationRequests: _1.initApi(registration_requests_api_1.registrationRequestsApiDeclaration, url),
|
|
36
|
+
agbs: (0, _1.initApi)(agb_api_1.agbApiDeclaration, url),
|
|
37
|
+
uploads: (0, _1.initApi)(uploads_api_1.uploadsApiDeclaration, url),
|
|
38
|
+
emails: (0, _1.initApi)(emails_api_1.emailsApiDeclaration, url),
|
|
39
|
+
admins: (0, _1.initApi)(admins_api_1.adminsApiDeclaration, url),
|
|
40
|
+
userMessages: (0, _1.initApi)(user_messages_api_1.userMessagesApiDeclaration, url),
|
|
41
|
+
orderDiscounts: (0, _1.initApi)(order_discounts_api_1.orderDiscountsApiDeclaration, url),
|
|
42
|
+
orderPenalties: (0, _1.initApi)(order_penalties_api_1.orderPenaltiesApiDeclaration, url),
|
|
43
|
+
orderUpsellngs: (0, _1.initApi)(order_upsellings_api_1.orderUpsellngsApiDeclaration, url),
|
|
44
|
+
slots: (0, _1.initApi)(slots_api_1.slotsApiDeclaration, url),
|
|
45
|
+
slotTemplates: (0, _1.initApi)(slot_templates_api_1.slotTemplatesApiDeclaration, url),
|
|
46
|
+
orders: (0, _1.initApi)(orders_api_1.ordersApiDeclaration, url),
|
|
47
|
+
cashboxes: (0, _1.initApi)(cashboxes_api_1.cashboxesApiDeclaration, url),
|
|
48
|
+
certificates: (0, _1.initApi)(certificates_api_1.certificatesApiDeclaration, url),
|
|
49
|
+
financeItems: (0, _1.initApi)(financeitems_api_1.financeItemsApiDeclaration, url),
|
|
50
|
+
locations: (0, _1.initApi)(locations_api_1.locationsApiDeclaration, url),
|
|
51
|
+
upsellings: (0, _1.initApi)(upsellings_api_1.upsellingsApiDeclaration, url),
|
|
52
|
+
partners: (0, _1.initApi)(partners_api_1.partnersApiDeclaration, url),
|
|
53
|
+
questrooms: (0, _1.initApi)(questrooms_api_1.questroomsApiDeclaration, url),
|
|
54
|
+
widgets: (0, _1.initApi)(widgets_api_1.widgetsApiDeclaration, url),
|
|
55
|
+
profiles: (0, _1.initApi)(profiles_api_1.profilesApiDeclaration, url),
|
|
56
|
+
users: (0, _1.initApi)(users_api_1.usersApiDeclaration, url),
|
|
57
|
+
clients: (0, _1.initApi)(clients_api_1.clientsApiDeclaration, url),
|
|
58
|
+
transactions: (0, _1.initApi)(transactions_api_1.transactionsApiDeclaration, url),
|
|
59
|
+
images: (0, _1.initApi)(images_api_1.imagesApiDeclaration, url),
|
|
60
|
+
roles: (0, _1.initApi)(roles_api_1.rolesApiDeclaration, url),
|
|
61
|
+
tariffs: (0, _1.initApi)(tariffs_api_1.tariffsApiDeclaration, url),
|
|
62
|
+
certificatesales: (0, _1.initApi)(certificatesales_api_1.certificateSalesApiDeclaration, url),
|
|
63
|
+
support: (0, _1.initApi)(support_1.supportApiDeclaration, url),
|
|
64
|
+
registrationRequests: (0, _1.initApi)(registration_requests_api_1.registrationRequestsApiDeclaration, url),
|
|
69
65
|
};
|
|
70
66
|
};
|
|
71
67
|
exports.initClientApi = initClientApi;
|
|
@@ -19,21 +19,21 @@ const get_service_error_1 = require("../../utils/get-service-error");
|
|
|
19
19
|
const api_1 = require("./actions/creators/api");
|
|
20
20
|
const api_2 = require("./reducers/api");
|
|
21
21
|
const useApiMethod = ({ api, successCallback, errorCallback, delay, }) => {
|
|
22
|
-
const mounted = react_1.useRef(false);
|
|
23
|
-
const source = react_1.useRef(null);
|
|
24
|
-
const [state, dispatch] = react_1.useReducer(api_2.apiReducer, api_2.initialState);
|
|
25
|
-
const fetch = react_1.useCallback((params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
22
|
+
const mounted = (0, react_1.useRef)(false);
|
|
23
|
+
const source = (0, react_1.useRef)(null);
|
|
24
|
+
const [state, dispatch] = (0, react_1.useReducer)(api_2.apiReducer, api_2.initialState);
|
|
25
|
+
const fetch = (0, react_1.useCallback)((params) => __awaiter(void 0, void 0, void 0, function* () {
|
|
26
26
|
source.current = axios_1.default.CancelToken.source();
|
|
27
27
|
const startTime = Date.now();
|
|
28
28
|
try {
|
|
29
|
-
dispatch(api_1.fetchStart());
|
|
29
|
+
dispatch((0, api_1.fetchStart)());
|
|
30
30
|
const response = yield api(params);
|
|
31
31
|
const deltaTime = Date.now() - startTime;
|
|
32
32
|
const delta = delay && deltaTime < delay ? 500 - deltaTime : 0;
|
|
33
33
|
setTimeout(() => {
|
|
34
34
|
if (successCallback)
|
|
35
35
|
successCallback(response);
|
|
36
|
-
dispatch(api_1.fetchSuccess(response));
|
|
36
|
+
dispatch((0, api_1.fetchSuccess)(response));
|
|
37
37
|
}, delta);
|
|
38
38
|
}
|
|
39
39
|
catch (error) {
|
|
@@ -41,12 +41,12 @@ const useApiMethod = ({ api, successCallback, errorCallback, delay, }) => {
|
|
|
41
41
|
errorCallback(error);
|
|
42
42
|
if (!mounted.current)
|
|
43
43
|
return;
|
|
44
|
-
const err = get_service_error_1.getServiceError(error);
|
|
45
|
-
dispatch(api_1.fetchFailure(err));
|
|
44
|
+
const err = (0, get_service_error_1.getServiceError)(error);
|
|
45
|
+
dispatch((0, api_1.fetchFailure)(err));
|
|
46
46
|
throw error;
|
|
47
47
|
}
|
|
48
48
|
}), [api, successCallback, errorCallback, delay]);
|
|
49
|
-
react_1.useEffect(() => {
|
|
49
|
+
(0, react_1.useEffect)(() => {
|
|
50
50
|
mounted.current = true;
|
|
51
51
|
return () => {
|
|
52
52
|
var _a;
|
|
@@ -29,7 +29,7 @@ const INTERNAL_SERVICE_ERROR_CODES = [
|
|
|
29
29
|
* @param error Ошибка от сервиса
|
|
30
30
|
*/
|
|
31
31
|
function getServiceError(error) {
|
|
32
|
-
if (is_network_error_1.isNetworkError(error)) {
|
|
32
|
+
if ((0, is_network_error_1.isNetworkError)(error)) {
|
|
33
33
|
return {
|
|
34
34
|
code: ERROR_CODES[ErrorType.NETWORK],
|
|
35
35
|
message: ERROR_MESSAGES[ErrorType.NETWORK],
|
|
@@ -37,7 +37,7 @@ function getServiceError(error) {
|
|
|
37
37
|
originalError: error,
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
|
-
if (is_axios_error_1.isAxiosError(error)) {
|
|
40
|
+
if ((0, is_axios_error_1.isAxiosError)(error)) {
|
|
41
41
|
const { errorCode, originalErrorCode, message } = error.response.data;
|
|
42
42
|
let code = errorCode;
|
|
43
43
|
let errorType = ErrorType.BUSINESS;
|
|
@@ -8,7 +8,7 @@ const NETWORK_ERROR_CODES = ['ENETUNREACH', 'ECONNABORTED', 'ENOTCONN'];
|
|
|
8
8
|
* @param error Ошибка от сервиса
|
|
9
9
|
*/
|
|
10
10
|
function isNetworkError(error) {
|
|
11
|
-
if (is_axios_error_1.isAxiosError(error)) {
|
|
11
|
+
if ((0, is_axios_error_1.isAxiosError)(error)) {
|
|
12
12
|
const { response, code, message } = error;
|
|
13
13
|
return (typeof response === 'undefined' &&
|
|
14
14
|
(NETWORK_ERROR_CODES.includes(code) || message === 'Network Error'));
|
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.serializeRecord = void 0;
|
|
4
4
|
const class_transformer_1 = require("class-transformer");
|
|
5
|
-
const serializeRecord = (Dto, data) => class_transformer_1.plainToClass(Dto, data, { strategy: 'excludeAll' });
|
|
5
|
+
const serializeRecord = (Dto, data) => (0, class_transformer_1.plainToClass)(Dto, data, { strategy: 'excludeAll' });
|
|
6
6
|
exports.serializeRecord = serializeRecord;
|
|
@@ -4,7 +4,7 @@ exports.validateByDto = void 0;
|
|
|
4
4
|
const class_validator_1 = require("class-validator");
|
|
5
5
|
function validateByDto(t) {
|
|
6
6
|
const validate = (data) => {
|
|
7
|
-
const errors = class_validator_1.validateSync(typeof data === 'object' ? data : {});
|
|
7
|
+
const errors = (0, class_validator_1.validateSync)(typeof data === 'object' ? data : {});
|
|
8
8
|
return Object.fromEntries(errors.map(({ property, constraints }) => {
|
|
9
9
|
const err = (constraints === null || constraints === void 0 ? void 0 : constraints.IsNotEmpty) || Object.values(constraints)[0];
|
|
10
10
|
const errorText = err.substr(err.indexOf(' ') + 1);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@escapenavigator/services",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.4",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -12,12 +12,13 @@
|
|
|
12
12
|
"scripts": {
|
|
13
13
|
"build": "rm -rf dist && tsc --project tsconfig.build.json"
|
|
14
14
|
},
|
|
15
|
-
"gitHead": "
|
|
15
|
+
"gitHead": "366360dd168e5a46b7e1040652706d03e48a2afb",
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@escapenavigator/types": "^1.1.
|
|
17
|
+
"@escapenavigator/types": "^1.1.4",
|
|
18
18
|
"axios": "^0.21.4",
|
|
19
|
-
"class-transformer": "^0.
|
|
19
|
+
"class-transformer": "^0.5.1",
|
|
20
20
|
"class-validator": "^0.13.1",
|
|
21
|
+
"i18next": "^21.6.4",
|
|
21
22
|
"react": "^17.0.2",
|
|
22
23
|
"react-dom": "^17.0.2"
|
|
23
24
|
},
|
|
@@ -34,7 +35,8 @@
|
|
|
34
35
|
"rollup-plugin-node-resolve": "^5.2.0",
|
|
35
36
|
"rollup-plugin-peer-deps-external": "^2.2.4",
|
|
36
37
|
"rollup-plugin-terser": "^7.0.2",
|
|
37
|
-
"ts-loader": "^6.2.1"
|
|
38
|
+
"ts-loader": "^6.2.1",
|
|
39
|
+
"typescript": "^4.5.4"
|
|
38
40
|
},
|
|
39
41
|
"perDependencies": {
|
|
40
42
|
"react": "17.0.2",
|