@aprilium/tripsm_message-support 0.0.13 → 0.0.15
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/lib/packages/message-support/src/effects.js +17 -19
- package/lib/packages/message-support/src/index.js +34 -42
- package/lib/packages/message-support/src/models/MessageSupport.js +1 -3
- package/lib/packages/message-support/src/parameters/AddMessageSupport.d.ts +2 -0
- package/lib/packages/message-support/src/parameters/AddMessageSupport.js +2 -3
- package/lib/packages/message-support/src/parameters/MessageSupportParameters.js +1 -2
- package/lib/packages/message-support/src/selectors.js +2 -7
- package/lib/packages/message-support/src/service.js +15 -21
- package/lib/packages/message-support/src/state.js +6 -9
- package/lib/utils/axios-interceptor.js +48 -47
- package/package.json +9 -2
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
3
2
|
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
4
3
|
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
@@ -26,11 +25,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
26
25
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
27
26
|
}
|
|
28
27
|
};
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
var state_1 = require("./state");
|
|
28
|
+
import { call, put, takeLatest } from "redux-saga/effects";
|
|
29
|
+
import { buildTechnicalErrorMessage } from "@aprilium/tripsm_common/lib/helper/utils";
|
|
30
|
+
import { addNewMessageSupport, fetchMessageSupportData } from "./service";
|
|
31
|
+
import { MessageSupportActions } from "./state";
|
|
34
32
|
function getMessageSupportEffect(action) {
|
|
35
33
|
var _a, result, error, statusCode, err_1;
|
|
36
34
|
return __generator(this, function (_b) {
|
|
@@ -40,28 +38,28 @@ function getMessageSupportEffect(action) {
|
|
|
40
38
|
if (!action.payload) {
|
|
41
39
|
throw Error("Missing parameters");
|
|
42
40
|
}
|
|
43
|
-
return [4 /*yield*/,
|
|
41
|
+
return [4 /*yield*/, call(fetchMessageSupportData, action.payload)];
|
|
44
42
|
case 1:
|
|
45
43
|
_a = _b.sent(), result = _a.result, error = _a.error, statusCode = _a.statusCode;
|
|
46
44
|
if (!(!result && error && statusCode)) return [3 /*break*/, 3];
|
|
47
|
-
return [4 /*yield*/,
|
|
45
|
+
return [4 /*yield*/, put(MessageSupportActions.getMessageSupportFailure("Failed to fetch support message:", buildTechnicalErrorMessage(error, statusCode)))];
|
|
48
46
|
case 2:
|
|
49
47
|
_b.sent();
|
|
50
48
|
return [3 /*break*/, 7];
|
|
51
49
|
case 3:
|
|
52
50
|
if (!(!result && error && !statusCode)) return [3 /*break*/, 5];
|
|
53
|
-
return [4 /*yield*/,
|
|
51
|
+
return [4 /*yield*/, put(MessageSupportActions.getMessageSupportFailure("Failed to fetch support message:", buildTechnicalErrorMessage(error)))];
|
|
54
52
|
case 4:
|
|
55
53
|
_b.sent();
|
|
56
54
|
return [3 /*break*/, 7];
|
|
57
|
-
case 5: return [4 /*yield*/,
|
|
55
|
+
case 5: return [4 /*yield*/, put(MessageSupportActions.getMessageSupportSuccess(result))];
|
|
58
56
|
case 6:
|
|
59
57
|
_b.sent();
|
|
60
58
|
_b.label = 7;
|
|
61
59
|
case 7: return [3 /*break*/, 10];
|
|
62
60
|
case 8:
|
|
63
61
|
err_1 = _b.sent();
|
|
64
|
-
return [4 /*yield*/,
|
|
62
|
+
return [4 /*yield*/, put(MessageSupportActions.getMessageSupportFailure("Failed to fetch support message:", buildTechnicalErrorMessage(err_1)))];
|
|
65
63
|
case 9:
|
|
66
64
|
_b.sent();
|
|
67
65
|
return [3 /*break*/, 10];
|
|
@@ -78,28 +76,28 @@ function addMessageSupportEffect(action) {
|
|
|
78
76
|
if (!action.payload) {
|
|
79
77
|
throw Error("Missing add MessageSupport parameters");
|
|
80
78
|
}
|
|
81
|
-
return [4 /*yield*/,
|
|
79
|
+
return [4 /*yield*/, call(addNewMessageSupport, action.payload)];
|
|
82
80
|
case 1:
|
|
83
81
|
_a = _b.sent(), success = _a.success, error = _a.error, statusCode = _a.statusCode, result = _a.result;
|
|
84
82
|
if (!(!success && error && statusCode)) return [3 /*break*/, 3];
|
|
85
|
-
return [4 /*yield*/,
|
|
83
|
+
return [4 /*yield*/, put(MessageSupportActions.addMessageSupportFailure("Failed to add support message", buildTechnicalErrorMessage(error, statusCode)))];
|
|
86
84
|
case 2:
|
|
87
85
|
_b.sent();
|
|
88
86
|
return [3 /*break*/, 7];
|
|
89
87
|
case 3:
|
|
90
88
|
if (!(!success && error && !statusCode)) return [3 /*break*/, 5];
|
|
91
|
-
return [4 /*yield*/,
|
|
89
|
+
return [4 /*yield*/, put(MessageSupportActions.addMessageSupportFailure("Failed to add support message", buildTechnicalErrorMessage(error)))];
|
|
92
90
|
case 4:
|
|
93
91
|
_b.sent();
|
|
94
92
|
return [3 /*break*/, 7];
|
|
95
|
-
case 5: return [4 /*yield*/,
|
|
93
|
+
case 5: return [4 /*yield*/, put(MessageSupportActions.addMessageSupportSuccess(result))];
|
|
96
94
|
case 6:
|
|
97
95
|
_b.sent();
|
|
98
96
|
_b.label = 7;
|
|
99
97
|
case 7: return [3 /*break*/, 10];
|
|
100
98
|
case 8:
|
|
101
99
|
err_2 = _b.sent();
|
|
102
|
-
return [4 /*yield*/,
|
|
100
|
+
return [4 /*yield*/, put(MessageSupportActions.addMessageSupportFailure("Failed to add support message", buildTechnicalErrorMessage(err_2)))];
|
|
103
101
|
case 9:
|
|
104
102
|
_b.sent();
|
|
105
103
|
return [3 /*break*/, 10];
|
|
@@ -110,14 +108,14 @@ function addMessageSupportEffect(action) {
|
|
|
110
108
|
function MessageSupportEffects() {
|
|
111
109
|
return __generator(this, function (_a) {
|
|
112
110
|
switch (_a.label) {
|
|
113
|
-
case 0: return [4 /*yield*/,
|
|
111
|
+
case 0: return [4 /*yield*/, takeLatest(MessageSupportActions.getMessageSupport.type, getMessageSupportEffect)];
|
|
114
112
|
case 1:
|
|
115
113
|
_a.sent();
|
|
116
|
-
return [4 /*yield*/,
|
|
114
|
+
return [4 /*yield*/, takeLatest(MessageSupportActions.addMessageSupport.type, addMessageSupportEffect)];
|
|
117
115
|
case 2:
|
|
118
116
|
_a.sent();
|
|
119
117
|
return [2 /*return*/];
|
|
120
118
|
}
|
|
121
119
|
});
|
|
122
120
|
}
|
|
123
|
-
|
|
121
|
+
export default MessageSupportEffects;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __assign = (this && this.__assign) || function () {
|
|
3
2
|
__assign = Object.assign || function(t) {
|
|
4
3
|
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
@@ -46,37 +45,31 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
46
45
|
}
|
|
47
46
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
48
47
|
};
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
import { createStore, applyMiddleware, combineReducers } from "redux";
|
|
49
|
+
import createSagaMiddleware from "redux-saga";
|
|
50
|
+
import { all, fork, take } from "redux-saga/effects";
|
|
51
|
+
import { PersistGate } from "redux-persist/integration/react";
|
|
52
|
+
import { persistStore, persistReducer, REHYDRATE } from "redux-persist";
|
|
53
|
+
import { createReducerFunction } from "immer-reducer";
|
|
54
|
+
import { initialState as messageSupportInitialState, MessageSupportReducerFunction as messageSupportReducerFunction } from "./state";
|
|
55
|
+
import messageSupportEffects from "./effects";
|
|
56
|
+
import UrlsConfigs from "@aprilium/tripsm_common/lib/urlsConfig";
|
|
57
|
+
export var initialSagas = {
|
|
58
|
+
messageSupport: messageSupportEffects,
|
|
51
59
|
};
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
var redux_1 = require("redux");
|
|
55
|
-
var redux_saga_1 = __importDefault(require("redux-saga"));
|
|
56
|
-
var effects_1 = require("redux-saga/effects");
|
|
57
|
-
var react_1 = require("redux-persist/integration/react");
|
|
58
|
-
var redux_persist_1 = require("redux-persist");
|
|
59
|
-
var immer_reducer_1 = require("immer-reducer");
|
|
60
|
-
var state_1 = require("./state");
|
|
61
|
-
var effects_2 = __importDefault(require("./effects"));
|
|
62
|
-
var urlsConfig_1 = __importDefault(require("@aprilium/tripsm_common/lib/urlsConfig"));
|
|
63
|
-
exports.initialSagas = {
|
|
64
|
-
messageSupport: effects_2.default,
|
|
60
|
+
export var initialStates = {
|
|
61
|
+
messageSupport: messageSupportInitialState,
|
|
65
62
|
};
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
};
|
|
69
|
-
exports.sagas = Object.keys(exports.initialSagas).map(function (key) { return exports.initialSagas[key]; });
|
|
70
|
-
exports.StateNames = {
|
|
63
|
+
export var sagas = Object.keys(initialSagas).map(function (key) { return initialSagas[key]; });
|
|
64
|
+
export var StateNames = {
|
|
71
65
|
messageSupportStateName: "message-support",
|
|
72
66
|
};
|
|
73
|
-
|
|
74
|
-
messageSupport:
|
|
67
|
+
export var reducers = {
|
|
68
|
+
messageSupport: messageSupportReducerFunction,
|
|
75
69
|
};
|
|
76
|
-
var newReducer = function (stateImmerClass, initialState) { return
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
exports.urlsConfig = new urlsConfig_1.default();
|
|
70
|
+
export var newReducer = function (stateImmerClass, initialState) { return createReducerFunction(stateImmerClass, initialState); };
|
|
71
|
+
export var sagaMiddleware = createSagaMiddleware();
|
|
72
|
+
export var urlsConfig = new UrlsConfigs();
|
|
80
73
|
function configStore(extraMiddleWares, // Adding other middlewares
|
|
81
74
|
persistConfig, // Configuration for persistState
|
|
82
75
|
extraStates, // Adding other states in the store
|
|
@@ -85,22 +78,22 @@ replaceAllStates // It will keep only extraStates
|
|
|
85
78
|
if (extraMiddleWares === void 0) { extraMiddleWares = []; }
|
|
86
79
|
if (extraStates === void 0) { extraStates = {}; }
|
|
87
80
|
if (replaceAllStates === void 0) { replaceAllStates = false; }
|
|
88
|
-
var _reducers =
|
|
81
|
+
var _reducers = combineReducers(__assign(__assign({}, reducers), extraStates));
|
|
89
82
|
if (replaceAllStates) {
|
|
90
|
-
_reducers =
|
|
83
|
+
_reducers = combineReducers(__assign({}, extraStates));
|
|
91
84
|
}
|
|
92
|
-
var _middleWares = __spreadArray(__spreadArray([], extraMiddleWares, true), [
|
|
85
|
+
var _middleWares = __spreadArray(__spreadArray([], extraMiddleWares, true), [sagaMiddleware], false);
|
|
93
86
|
// @ts-ignore
|
|
94
|
-
var persistedReducer =
|
|
95
|
-
var store =
|
|
96
|
-
var persistor =
|
|
97
|
-
return { store: store, persistor: persistor, PersistGate:
|
|
87
|
+
var persistedReducer = persistReducer(persistConfig, _reducers);
|
|
88
|
+
var store = createStore(persistedReducer, applyMiddleware.apply(void 0, _middleWares));
|
|
89
|
+
var persistor = persistStore(store);
|
|
90
|
+
return { store: store, persistor: persistor, PersistGate: PersistGate };
|
|
98
91
|
}
|
|
99
|
-
function initSagaMiddleware(extraSagas, // local sagas from frontEnd Client
|
|
92
|
+
export function initSagaMiddleware(extraSagas, // local sagas from frontEnd Client
|
|
100
93
|
waitForRehydrate) {
|
|
101
94
|
if (extraSagas === void 0) { extraSagas = []; }
|
|
102
95
|
if (waitForRehydrate === void 0) { waitForRehydrate = false; }
|
|
103
|
-
var _sagas = __spreadArray(__spreadArray([],
|
|
96
|
+
var _sagas = __spreadArray(__spreadArray([], sagas, true), extraSagas, true);
|
|
104
97
|
// It will initialize all sagas
|
|
105
98
|
function rootSaga() {
|
|
106
99
|
var instSagas;
|
|
@@ -108,14 +101,14 @@ waitForRehydrate) {
|
|
|
108
101
|
switch (_a.label) {
|
|
109
102
|
case 0:
|
|
110
103
|
if (!waitForRehydrate) return [3 /*break*/, 2];
|
|
111
|
-
return [4 /*yield*/,
|
|
104
|
+
return [4 /*yield*/, take(REHYDRATE)];
|
|
112
105
|
case 1:
|
|
113
106
|
_a.sent();
|
|
114
107
|
_a.label = 2;
|
|
115
108
|
case 2: return [4 /*yield*/, _sagas.map(function (saga) {
|
|
116
109
|
return __generator(this, function (_a) {
|
|
117
110
|
switch (_a.label) {
|
|
118
|
-
case 0: return [4 /*yield*/,
|
|
111
|
+
case 0: return [4 /*yield*/, fork(saga)];
|
|
119
112
|
case 1:
|
|
120
113
|
_a.sent();
|
|
121
114
|
return [2 /*return*/];
|
|
@@ -124,7 +117,7 @@ waitForRehydrate) {
|
|
|
124
117
|
})];
|
|
125
118
|
case 3:
|
|
126
119
|
instSagas = _a.sent();
|
|
127
|
-
return [4 /*yield*/,
|
|
120
|
+
return [4 /*yield*/, all(instSagas)];
|
|
128
121
|
case 4:
|
|
129
122
|
_a.sent();
|
|
130
123
|
return [2 /*return*/];
|
|
@@ -132,7 +125,6 @@ waitForRehydrate) {
|
|
|
132
125
|
});
|
|
133
126
|
}
|
|
134
127
|
// Start the listener
|
|
135
|
-
|
|
128
|
+
sagaMiddleware.run(rootSaga);
|
|
136
129
|
}
|
|
137
|
-
|
|
138
|
-
exports.default = configStore;
|
|
130
|
+
export default configStore;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
1
|
var MessageSupport = /** @class */ (function () {
|
|
4
2
|
function MessageSupport(props) {
|
|
5
3
|
this.Id = props.Id;
|
|
@@ -19,4 +17,4 @@ var MessageSupport = /** @class */ (function () {
|
|
|
19
17
|
}
|
|
20
18
|
return MessageSupport;
|
|
21
19
|
}());
|
|
22
|
-
|
|
20
|
+
export default MessageSupport;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export type AddMessageSupportDataType = {
|
|
2
2
|
GuestId: number;
|
|
3
|
+
ConversationId?: number | null;
|
|
3
4
|
AgencyId: number;
|
|
4
5
|
MessageContent?: string | null;
|
|
5
6
|
Media: File | null;
|
|
@@ -11,6 +12,7 @@ export type AddMessageSupportDataType = {
|
|
|
11
12
|
};
|
|
12
13
|
declare class AddMessageSupport {
|
|
13
14
|
GuestId: number;
|
|
15
|
+
ConversationId?: number | null;
|
|
14
16
|
AgencyId: number;
|
|
15
17
|
MessageContent?: string | null;
|
|
16
18
|
Media: File | null;
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
1
|
var AddMessageSupport = /** @class */ (function () {
|
|
4
2
|
function AddMessageSupport(props) {
|
|
5
3
|
this.GuestId = props.GuestId;
|
|
4
|
+
this.ConversationId = props.ConversationId;
|
|
6
5
|
this.AgencyId = props.AgencyId;
|
|
7
6
|
this.MessageContent = props.MessageContent;
|
|
8
7
|
this.Media = props.Media;
|
|
@@ -14,4 +13,4 @@ var AddMessageSupport = /** @class */ (function () {
|
|
|
14
13
|
}
|
|
15
14
|
return AddMessageSupport;
|
|
16
15
|
}());
|
|
17
|
-
|
|
16
|
+
export default AddMessageSupport;
|
|
@@ -1,2 +1 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
1
|
+
export {};
|
|
@@ -1,12 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getMessageSupportsList = exports.getMessageSupportState = void 0;
|
|
4
|
-
function getMessageSupportState(states) {
|
|
1
|
+
export function getMessageSupportState(states) {
|
|
5
2
|
return states === null || states === void 0 ? void 0 : states.messageSupport;
|
|
6
3
|
}
|
|
7
|
-
|
|
8
|
-
function getMessageSupportsList(states) {
|
|
4
|
+
export function getMessageSupportsList(states) {
|
|
9
5
|
var _a;
|
|
10
6
|
return (_a = states === null || states === void 0 ? void 0 : states.messageSupport) === null || _a === void 0 ? void 0 : _a.MessageSupportByConversation;
|
|
11
7
|
}
|
|
12
|
-
exports.getMessageSupportsList = getMessageSupportsList;
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
2
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
3
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -35,15 +34,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
34
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
35
|
}
|
|
37
36
|
};
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
};
|
|
41
|
-
|
|
42
|
-
exports.addNewMessageSupport = exports.fetchMessageSupportData = void 0;
|
|
43
|
-
var axios_interceptor_1 = __importDefault(require("../../../utils/axios-interceptor"));
|
|
44
|
-
var index_1 = require("./index");
|
|
45
|
-
var serviceUtils_1 = require("@aprilium/tripsm_common/lib/helper/serviceUtils");
|
|
46
|
-
var axios_1 = __importDefault(require("axios"));
|
|
37
|
+
import Axios from "../../../utils/axios-interceptor";
|
|
38
|
+
import { urlsConfig } from "./index";
|
|
39
|
+
import { buildQueryParams } from "@aprilium/tripsm_common/lib/helper/serviceUtils";
|
|
40
|
+
import axios from "axios";
|
|
47
41
|
function fetchMessageSupportData(MessageSupportParameters) {
|
|
48
42
|
var _a, _b;
|
|
49
43
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -52,14 +46,14 @@ function fetchMessageSupportData(MessageSupportParameters) {
|
|
|
52
46
|
switch (_c.label) {
|
|
53
47
|
case 0:
|
|
54
48
|
route = "/api/MessageSupport/get";
|
|
55
|
-
if (!
|
|
49
|
+
if (!urlsConfig.values)
|
|
56
50
|
throw Error("No urls config found");
|
|
57
|
-
query =
|
|
58
|
-
encodedUrl = "".concat(
|
|
51
|
+
query = buildQueryParams(MessageSupportParameters);
|
|
52
|
+
encodedUrl = "".concat(urlsConfig.values.CORE_BASE_URL).concat(route).concat(query);
|
|
59
53
|
_c.label = 1;
|
|
60
54
|
case 1:
|
|
61
55
|
_c.trys.push([1, 3, , 4]);
|
|
62
|
-
return [4 /*yield*/,
|
|
56
|
+
return [4 /*yield*/, Axios.get(encodedUrl, {
|
|
63
57
|
headers: {
|
|
64
58
|
"Content-Type": "application/json;charset=utf-8",
|
|
65
59
|
"Access-Control-Allow-Origin": "http://localhost:3000",
|
|
@@ -72,7 +66,7 @@ function fetchMessageSupportData(MessageSupportParameters) {
|
|
|
72
66
|
return [2 /*return*/, { result: response.data, success: true }];
|
|
73
67
|
case 3:
|
|
74
68
|
exception_1 = _c.sent();
|
|
75
|
-
if (
|
|
69
|
+
if (axios.isAxiosError(exception_1)) {
|
|
76
70
|
return [2 /*return*/, { success: false, error: (_a = exception_1.response) === null || _a === void 0 ? void 0 : _a.data, statusCode: (_b = exception_1.response) === null || _b === void 0 ? void 0 : _b.status }];
|
|
77
71
|
}
|
|
78
72
|
else {
|
|
@@ -84,7 +78,6 @@ function fetchMessageSupportData(MessageSupportParameters) {
|
|
|
84
78
|
});
|
|
85
79
|
});
|
|
86
80
|
}
|
|
87
|
-
exports.fetchMessageSupportData = fetchMessageSupportData;
|
|
88
81
|
function addNewMessageSupport(newMessageSupport) {
|
|
89
82
|
var _a, _b;
|
|
90
83
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -93,9 +86,9 @@ function addNewMessageSupport(newMessageSupport) {
|
|
|
93
86
|
switch (_c.label) {
|
|
94
87
|
case 0:
|
|
95
88
|
route = "/api/MessageSupport/insert";
|
|
96
|
-
if (!
|
|
89
|
+
if (!urlsConfig.values)
|
|
97
90
|
throw Error("No urls config found");
|
|
98
|
-
url = "".concat(
|
|
91
|
+
url = "".concat(urlsConfig.values.CORE_BASE_URL).concat(route);
|
|
99
92
|
formData = new FormData();
|
|
100
93
|
formData.append("AgencyId", newMessageSupport.AgencyId.toString());
|
|
101
94
|
formData.append("GuestId", newMessageSupport.GuestId.toString());
|
|
@@ -105,11 +98,12 @@ function addNewMessageSupport(newMessageSupport) {
|
|
|
105
98
|
formData.append("FirstMessage", newMessageSupport.FirstMessage.toString());
|
|
106
99
|
newMessageSupport.MessageContent && formData.append("MessageContent", newMessageSupport.MessageContent);
|
|
107
100
|
newMessageSupport.AssignedStaffId && formData.append("AssignedStaffId", newMessageSupport.AssignedStaffId.toString());
|
|
101
|
+
newMessageSupport.ConversationId && formData.append("ConversationId", newMessageSupport.ConversationId.toString());
|
|
108
102
|
newMessageSupport.Media && formData.append("Media", newMessageSupport.Media);
|
|
109
103
|
_c.label = 1;
|
|
110
104
|
case 1:
|
|
111
105
|
_c.trys.push([1, 3, , 4]);
|
|
112
|
-
return [4 /*yield*/,
|
|
106
|
+
return [4 /*yield*/, Axios.post(url, formData, {
|
|
113
107
|
headers: {
|
|
114
108
|
"Content-Type": "multipart/form-data",
|
|
115
109
|
},
|
|
@@ -119,7 +113,7 @@ function addNewMessageSupport(newMessageSupport) {
|
|
|
119
113
|
return [2 /*return*/, { result: response.data, success: true }];
|
|
120
114
|
case 3:
|
|
121
115
|
exception_2 = _c.sent();
|
|
122
|
-
if (
|
|
116
|
+
if (axios.isAxiosError(exception_2)) {
|
|
123
117
|
return [2 /*return*/, { success: false, error: (_a = exception_2.response) === null || _a === void 0 ? void 0 : _a.data, statusCode: (_b = exception_2.response) === null || _b === void 0 ? void 0 : _b.status }];
|
|
124
118
|
}
|
|
125
119
|
else {
|
|
@@ -131,4 +125,4 @@ function addNewMessageSupport(newMessageSupport) {
|
|
|
131
125
|
});
|
|
132
126
|
});
|
|
133
127
|
}
|
|
134
|
-
|
|
128
|
+
export { fetchMessageSupportData, addNewMessageSupport };
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __extends = (this && this.__extends) || (function () {
|
|
3
2
|
var extendStatics = function (d, b) {
|
|
4
3
|
extendStatics = Object.setPrototypeOf ||
|
|
@@ -14,10 +13,8 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
14
13
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
15
14
|
};
|
|
16
15
|
})();
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
var immer_reducer_1 = require("immer-reducer");
|
|
20
|
-
exports.initialState = {
|
|
16
|
+
import { ImmerReducer, createActionCreators, createReducerFunction } from "immer-reducer";
|
|
17
|
+
export var initialState = {
|
|
21
18
|
getMessageSupport: {
|
|
22
19
|
loading: false,
|
|
23
20
|
success: false,
|
|
@@ -78,7 +75,7 @@ var MessageSupportState = /** @class */ (function (_super) {
|
|
|
78
75
|
this.draftState.addMessageSupport.technicalErrorMessageSupport = technicalErrorMessageSupport;
|
|
79
76
|
};
|
|
80
77
|
return MessageSupportState;
|
|
81
|
-
}(
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
78
|
+
}(ImmerReducer));
|
|
79
|
+
export { MessageSupportState };
|
|
80
|
+
export var MessageSupportActions = createActionCreators(MessageSupportState);
|
|
81
|
+
export var MessageSupportReducerFunction = createReducerFunction(MessageSupportState, initialState);
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
2
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
3
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -35,64 +34,66 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
34
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
35
|
}
|
|
37
36
|
};
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
if (typeof window !== "undefined" &&
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
}
|
|
73
|
-
});
|
|
74
|
-
}
|
|
75
|
-
var customAxios =
|
|
37
|
+
import axios from "axios";
|
|
38
|
+
// Improved token getter with safe mobile detection
|
|
39
|
+
var getToken = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
40
|
+
var AsyncStorage, _a, error_1;
|
|
41
|
+
return __generator(this, function (_b) {
|
|
42
|
+
switch (_b.label) {
|
|
43
|
+
case 0:
|
|
44
|
+
// Web environment
|
|
45
|
+
if (typeof window !== "undefined" && window.localStorage) {
|
|
46
|
+
return [2 /*return*/, localStorage.getItem("token")];
|
|
47
|
+
}
|
|
48
|
+
if (!(typeof navigator !== "undefined" && navigator.product === "ReactNative")) return [3 /*break*/, 7];
|
|
49
|
+
_b.label = 1;
|
|
50
|
+
case 1:
|
|
51
|
+
_b.trys.push([1, 6, , 7]);
|
|
52
|
+
return [4 /*yield*/, import("@react-native-async-storage/async-storage")
|
|
53
|
+
.then(function (m) { return (m === null || m === void 0 ? void 0 : m.default) || m; })
|
|
54
|
+
.catch(function () { return null; })];
|
|
55
|
+
case 2:
|
|
56
|
+
AsyncStorage = _b.sent();
|
|
57
|
+
if (!AsyncStorage) return [3 /*break*/, 4];
|
|
58
|
+
return [4 /*yield*/, AsyncStorage.getItem("token")];
|
|
59
|
+
case 3:
|
|
60
|
+
_a = _b.sent();
|
|
61
|
+
return [3 /*break*/, 5];
|
|
62
|
+
case 4:
|
|
63
|
+
_a = null;
|
|
64
|
+
_b.label = 5;
|
|
65
|
+
case 5: return [2 /*return*/, _a];
|
|
66
|
+
case 6:
|
|
67
|
+
error_1 = _b.sent();
|
|
68
|
+
console.error("Mobile token error:", error_1);
|
|
69
|
+
return [2 /*return*/, null];
|
|
70
|
+
case 7: return [2 /*return*/, null];
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
}); };
|
|
74
|
+
var customAxios = axios.create({
|
|
76
75
|
baseURL: "https://localhost:47616",
|
|
77
76
|
});
|
|
78
77
|
customAxios.interceptors.request.use(function (config) { return __awaiter(void 0, void 0, void 0, function () {
|
|
79
|
-
var
|
|
78
|
+
var skipRoutes, token;
|
|
80
79
|
return __generator(this, function (_a) {
|
|
81
80
|
switch (_a.label) {
|
|
82
81
|
case 0:
|
|
83
|
-
|
|
84
|
-
|
|
82
|
+
skipRoutes = [
|
|
83
|
+
"/api/authGuest/signin",
|
|
84
|
+
"/api/authGuest/signup",
|
|
85
|
+
"/api/auth/signin",
|
|
86
|
+
];
|
|
87
|
+
if (!!skipRoutes.includes(config.url || "")) return [3 /*break*/, 2];
|
|
85
88
|
return [4 /*yield*/, getToken()];
|
|
86
89
|
case 1:
|
|
87
90
|
token = _a.sent();
|
|
88
91
|
if (token) {
|
|
89
|
-
config.headers
|
|
92
|
+
config.headers.Authorization = "Bearer ".concat(token);
|
|
90
93
|
}
|
|
91
94
|
_a.label = 2;
|
|
92
95
|
case 2: return [2 /*return*/, config];
|
|
93
96
|
}
|
|
94
97
|
});
|
|
95
|
-
}); }, function (error) {
|
|
96
|
-
|
|
97
|
-
});
|
|
98
|
-
exports.default = customAxios;
|
|
98
|
+
}); }, function (error) { return Promise.reject(error); });
|
|
99
|
+
export default customAxios;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aprilium/tripsm_message-support",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.15",
|
|
4
4
|
"description": "message states",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -22,7 +22,14 @@
|
|
|
22
22
|
"redux": "^4.1.0",
|
|
23
23
|
"redux-persist": "^6.0.0",
|
|
24
24
|
"redux-saga": "^1.1.3",
|
|
25
|
-
"typescript": "^4.8.4"
|
|
25
|
+
"typescript": "^4.8.4",
|
|
26
|
+
"react-native": "*"
|
|
27
|
+
},
|
|
28
|
+
"peerDependencies": {
|
|
29
|
+
"@react-native-async-storage/async-storage": "*"
|
|
30
|
+
},
|
|
31
|
+
"optionalDependencies": {
|
|
32
|
+
"@react-native-async-storage/async-storage": "^1.15.0"
|
|
26
33
|
},
|
|
27
34
|
"author": "ADH",
|
|
28
35
|
"license": "ISC"
|