@aprilium/tripsm_support-conversation 0.0.9 → 0.0.11
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/support-conversation/src/effects.js +28 -30
- package/lib/packages/support-conversation/src/index.js +34 -42
- package/lib/packages/support-conversation/src/models/SupportConversation.d.ts +2 -0
- package/lib/packages/support-conversation/src/models/SupportConversation.js +2 -3
- package/lib/packages/support-conversation/src/parameters/AddSupportConversation.js +1 -3
- package/lib/packages/support-conversation/src/parameters/SupportConversationParameters.js +1 -2
- package/lib/packages/support-conversation/src/parameters/UpdateSupportConversation.js +1 -3
- package/lib/packages/support-conversation/src/selectors.js +3 -9
- package/lib/packages/support-conversation/src/service.js +23 -32
- package/lib/packages/support-conversation/src/state.js +7 -10
- 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 { addNewSupportConversation, fetchSupportConversationByGuest, fetchSupportConversationByUser, updateSupportConversation } from "./service";
|
|
31
|
+
import { SupportConversationActions } from "./state";
|
|
34
32
|
function getSupportConversationByUserEffect(action) {
|
|
35
33
|
var _a, result, error, statusCode, err_1;
|
|
36
34
|
return __generator(this, function (_b) {
|
|
@@ -40,28 +38,28 @@ function getSupportConversationByUserEffect(action) {
|
|
|
40
38
|
if (!action.payload) {
|
|
41
39
|
throw Error("Missing Paging parameters");
|
|
42
40
|
}
|
|
43
|
-
return [4 /*yield*/,
|
|
41
|
+
return [4 /*yield*/, call(fetchSupportConversationByUser, 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(SupportConversationActions.getSupportConversationByUserFailure("Failed to fetch reservations:", 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(SupportConversationActions.getSupportConversationByUserFailure("Failed to fetch reservations:", 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(SupportConversationActions.getSupportConversationByUserSuccess(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(SupportConversationActions.getSupportConversationByUserFailure("Failed to fetch reservations:", buildTechnicalErrorMessage(err_1)))];
|
|
65
63
|
case 9:
|
|
66
64
|
_b.sent();
|
|
67
65
|
return [3 /*break*/, 10];
|
|
@@ -78,28 +76,28 @@ function getSupportConversationByGuestEffect(action) {
|
|
|
78
76
|
if (!action.payload) {
|
|
79
77
|
throw Error("Missing Paging parameters");
|
|
80
78
|
}
|
|
81
|
-
return [4 /*yield*/,
|
|
79
|
+
return [4 /*yield*/, call(fetchSupportConversationByGuest, action.payload)];
|
|
82
80
|
case 1:
|
|
83
81
|
_a = _b.sent(), result = _a.result, error = _a.error, statusCode = _a.statusCode;
|
|
84
82
|
if (!(!result && error && statusCode)) return [3 /*break*/, 3];
|
|
85
|
-
return [4 /*yield*/,
|
|
83
|
+
return [4 /*yield*/, put(SupportConversationActions.getSupportConversationByGuestFailure("Failed to fetch reservations:", buildTechnicalErrorMessage(error, statusCode)))];
|
|
86
84
|
case 2:
|
|
87
85
|
_b.sent();
|
|
88
86
|
return [3 /*break*/, 7];
|
|
89
87
|
case 3:
|
|
90
88
|
if (!(!result && error && !statusCode)) return [3 /*break*/, 5];
|
|
91
|
-
return [4 /*yield*/,
|
|
89
|
+
return [4 /*yield*/, put(SupportConversationActions.getSupportConversationByGuestFailure("Failed to fetch reservations:", 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(SupportConversationActions.getSupportConversationByGuestSuccess(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(SupportConversationActions.getSupportConversationByGuestFailure("Failed to fetch reservations:", buildTechnicalErrorMessage(err_2)))];
|
|
103
101
|
case 9:
|
|
104
102
|
_b.sent();
|
|
105
103
|
return [3 /*break*/, 10];
|
|
@@ -116,22 +114,22 @@ function addSupportConversationEffect(action) {
|
|
|
116
114
|
if (!action.payload) {
|
|
117
115
|
throw Error("Missing add Reservation parameters");
|
|
118
116
|
}
|
|
119
|
-
return [4 /*yield*/,
|
|
117
|
+
return [4 /*yield*/, call(addNewSupportConversation, action.payload)];
|
|
120
118
|
case 1:
|
|
121
119
|
_a = _b.sent(), result = _a.result, error = _a.error, statusCode = _a.statusCode, success = _a.success;
|
|
122
120
|
if (!!success) return [3 /*break*/, 3];
|
|
123
|
-
return [4 /*yield*/,
|
|
121
|
+
return [4 /*yield*/, put(SupportConversationActions.addSupportConversationFailure("Couldn't add ReservationSupportConversation", buildTechnicalErrorMessage(error, statusCode)))];
|
|
124
122
|
case 2:
|
|
125
123
|
_b.sent();
|
|
126
124
|
return [3 /*break*/, 5];
|
|
127
|
-
case 3: return [4 /*yield*/,
|
|
125
|
+
case 3: return [4 /*yield*/, put(SupportConversationActions.addSupportConversationSuccess(result))];
|
|
128
126
|
case 4:
|
|
129
127
|
_b.sent();
|
|
130
128
|
_b.label = 5;
|
|
131
129
|
case 5: return [3 /*break*/, 8];
|
|
132
130
|
case 6:
|
|
133
131
|
err_3 = _b.sent();
|
|
134
|
-
return [4 /*yield*/,
|
|
132
|
+
return [4 /*yield*/, put(SupportConversationActions.addSupportConversationFailure("app_name", buildTechnicalErrorMessage(err_3)))];
|
|
135
133
|
case 7:
|
|
136
134
|
_b.sent();
|
|
137
135
|
return [3 /*break*/, 8];
|
|
@@ -148,22 +146,22 @@ function updateSupportConversationEffect(action) {
|
|
|
148
146
|
if (!action.payload) {
|
|
149
147
|
throw Error("Missing update Reservation parameters");
|
|
150
148
|
}
|
|
151
|
-
return [4 /*yield*/,
|
|
149
|
+
return [4 /*yield*/, call(updateSupportConversation, action.payload)];
|
|
152
150
|
case 1:
|
|
153
151
|
_a = _b.sent(), result = _a.result, error = _a.error, statusCode = _a.statusCode, success = _a.success;
|
|
154
152
|
if (!!success) return [3 /*break*/, 3];
|
|
155
|
-
return [4 /*yield*/,
|
|
153
|
+
return [4 /*yield*/, put(SupportConversationActions.updateSupportConversationFailure("Couldn't update Reservation", buildTechnicalErrorMessage(error, statusCode)))];
|
|
156
154
|
case 2:
|
|
157
155
|
_b.sent();
|
|
158
156
|
return [3 /*break*/, 5];
|
|
159
|
-
case 3: return [4 /*yield*/,
|
|
157
|
+
case 3: return [4 /*yield*/, put(SupportConversationActions.updateSupportConversationSuccess())];
|
|
160
158
|
case 4:
|
|
161
159
|
_b.sent();
|
|
162
160
|
_b.label = 5;
|
|
163
161
|
case 5: return [3 /*break*/, 8];
|
|
164
162
|
case 6:
|
|
165
163
|
err_4 = _b.sent();
|
|
166
|
-
return [4 /*yield*/,
|
|
164
|
+
return [4 /*yield*/, put(SupportConversationActions.updateSupportConversationFailure("app_name", buildTechnicalErrorMessage(err_4)))];
|
|
167
165
|
case 7:
|
|
168
166
|
_b.sent();
|
|
169
167
|
return [3 /*break*/, 8];
|
|
@@ -174,23 +172,23 @@ function updateSupportConversationEffect(action) {
|
|
|
174
172
|
function SupportConversationEffects() {
|
|
175
173
|
return __generator(this, function (_a) {
|
|
176
174
|
switch (_a.label) {
|
|
177
|
-
case 0: return [4 /*yield*/,
|
|
175
|
+
case 0: return [4 /*yield*/, takeLatest(SupportConversationActions.getSupportConversationByGuest.type, getSupportConversationByGuestEffect)];
|
|
178
176
|
case 1:
|
|
179
177
|
_a.sent();
|
|
180
|
-
return [4 /*yield*/,
|
|
178
|
+
return [4 /*yield*/, takeLatest(SupportConversationActions.getSupportConversationByUser.type, getSupportConversationByUserEffect)];
|
|
181
179
|
case 2:
|
|
182
180
|
_a.sent();
|
|
183
|
-
return [4 /*yield*/,
|
|
181
|
+
return [4 /*yield*/, takeLatest(SupportConversationActions.addSupportConversation.type, addSupportConversationEffect)];
|
|
184
182
|
case 3:
|
|
185
183
|
_a.sent();
|
|
186
|
-
return [4 /*yield*/,
|
|
184
|
+
return [4 /*yield*/, takeLatest(SupportConversationActions.updateSupportConversation.type, updateSupportConversationEffect)];
|
|
187
185
|
case 4:
|
|
188
186
|
_a.sent();
|
|
189
|
-
return [4 /*yield*/,
|
|
187
|
+
return [4 /*yield*/, takeLatest(SupportConversationActions.updateSupportConversation.type, updateSupportConversationEffect)];
|
|
190
188
|
case 5:
|
|
191
189
|
_a.sent();
|
|
192
190
|
return [2 /*return*/];
|
|
193
191
|
}
|
|
194
192
|
});
|
|
195
193
|
}
|
|
196
|
-
|
|
194
|
+
export default SupportConversationEffects;
|
|
@@ -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 supportConversationInitialState, SupportConversationReducerFunction as supportConversationReducerFunction } from "./state";
|
|
55
|
+
import supportConversationEffects from "./effects";
|
|
56
|
+
import UrlsConfigs from "@aprilium/tripsm_common/lib/urlsConfig";
|
|
57
|
+
export var initialSagas = {
|
|
58
|
+
supportConversation: supportConversationEffects,
|
|
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
|
-
supportConversation: effects_2.default,
|
|
60
|
+
export var initialStates = {
|
|
61
|
+
supportConversation: supportConversationInitialState,
|
|
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
|
supportConversationStateName: "support-conversation",
|
|
72
66
|
};
|
|
73
|
-
|
|
74
|
-
supportConversation:
|
|
67
|
+
export var reducers = {
|
|
68
|
+
supportConversation: supportConversationReducerFunction,
|
|
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;
|
|
@@ -20,6 +20,7 @@ export type SupportConversationDataType = {
|
|
|
20
20
|
IsGuest?: number;
|
|
21
21
|
NewMessageCountStaff: number;
|
|
22
22
|
NewMessageCountGuest: number;
|
|
23
|
+
PassengerId?: number | null;
|
|
23
24
|
};
|
|
24
25
|
declare class SupportConversation {
|
|
25
26
|
Id: number;
|
|
@@ -43,6 +44,7 @@ declare class SupportConversation {
|
|
|
43
44
|
IsGuest?: number;
|
|
44
45
|
NewMessageCountStaff: number;
|
|
45
46
|
NewMessageCountGuest: number;
|
|
47
|
+
PassengerId?: number | null;
|
|
46
48
|
constructor(props: SupportConversationDataType);
|
|
47
49
|
}
|
|
48
50
|
export default SupportConversation;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
1
|
var SupportConversation = /** @class */ (function () {
|
|
4
2
|
function SupportConversation(props) {
|
|
5
3
|
this.Id = props.Id;
|
|
@@ -24,7 +22,8 @@ var SupportConversation = /** @class */ (function () {
|
|
|
24
22
|
this.IsGuest = props.IsGuest;
|
|
25
23
|
this.NewMessageCountStaff = props.NewMessageCountStaff;
|
|
26
24
|
this.NewMessageCountGuest = props.NewMessageCountGuest;
|
|
25
|
+
this.PassengerId = props.PassengerId;
|
|
27
26
|
}
|
|
28
27
|
return SupportConversation;
|
|
29
28
|
}());
|
|
30
|
-
|
|
29
|
+
export default SupportConversation;
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
1
|
var AddSupportConversation = /** @class */ (function () {
|
|
4
2
|
function AddSupportConversation(props) {
|
|
5
3
|
this.StaffId = props.StaffId;
|
|
@@ -8,4 +6,4 @@ var AddSupportConversation = /** @class */ (function () {
|
|
|
8
6
|
}
|
|
9
7
|
return AddSupportConversation;
|
|
10
8
|
}());
|
|
11
|
-
|
|
9
|
+
export default AddSupportConversation;
|
|
@@ -1,2 +1 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
1
|
+
export {};
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
1
|
var UpdateSupportConversation = /** @class */ (function () {
|
|
4
2
|
function UpdateSupportConversation(props) {
|
|
5
3
|
this.ConversationId = props.ConversationId;
|
|
@@ -13,4 +11,4 @@ var UpdateSupportConversation = /** @class */ (function () {
|
|
|
13
11
|
}
|
|
14
12
|
return UpdateSupportConversation;
|
|
15
13
|
}());
|
|
16
|
-
|
|
14
|
+
export default UpdateSupportConversation;
|
|
@@ -1,17 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getSupportConversationByUser = exports.getSupportConversationByGuest = exports.getSupportConversationState = void 0;
|
|
4
|
-
function getSupportConversationState(states) {
|
|
1
|
+
export function getSupportConversationState(states) {
|
|
5
2
|
return states === null || states === void 0 ? void 0 : states.supportConversation;
|
|
6
3
|
}
|
|
7
|
-
|
|
8
|
-
function getSupportConversationByGuest(states) {
|
|
4
|
+
export function getSupportConversationByGuest(states) {
|
|
9
5
|
var _a, _b;
|
|
10
6
|
return (_b = (_a = states === null || states === void 0 ? void 0 : states.supportConversation) === null || _a === void 0 ? void 0 : _a.SupportConversationByGuest) !== null && _b !== void 0 ? _b : null;
|
|
11
7
|
}
|
|
12
|
-
|
|
13
|
-
function getSupportConversationByUser(states) {
|
|
8
|
+
export function getSupportConversationByUser(states) {
|
|
14
9
|
var _a, _b;
|
|
15
10
|
return (_b = (_a = states === null || states === void 0 ? void 0 : states.supportConversation) === null || _a === void 0 ? void 0 : _a.SupportConversationByUser) !== null && _b !== void 0 ? _b : null;
|
|
16
11
|
}
|
|
17
|
-
exports.getSupportConversationByUser = getSupportConversationByUser;
|
|
@@ -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.updateSupportConversation = exports.fetchSupportConversationByUser = exports.fetchSupportConversationByGuest = exports.addNewSupportConversation = void 0;
|
|
43
|
-
var axios_interceptor_1 = __importDefault(require("../../../utils/axios-interceptor"));
|
|
44
|
-
var axios_1 = __importDefault(require("axios"));
|
|
45
|
-
var index_1 = require("./index");
|
|
46
|
-
var serviceUtils_1 = require("@aprilium/tripsm_common/lib/helper/serviceUtils");
|
|
37
|
+
import Axios from "../../../utils/axios-interceptor";
|
|
38
|
+
import axios from "axios";
|
|
39
|
+
import { urlsConfig } from "./index";
|
|
40
|
+
import { buildQueryParams } from "@aprilium/tripsm_common/lib/helper/serviceUtils";
|
|
47
41
|
function fetchSupportConversationByUser(SupportConversationParameters) {
|
|
48
42
|
var _a, _b;
|
|
49
43
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -52,14 +46,14 @@ function fetchSupportConversationByUser(SupportConversationParameters) {
|
|
|
52
46
|
switch (_c.label) {
|
|
53
47
|
case 0:
|
|
54
48
|
route = "/api/SupportConversation/getByUser";
|
|
55
|
-
if (!
|
|
49
|
+
if (!urlsConfig.values)
|
|
56
50
|
throw Error("No urls config found");
|
|
57
|
-
queryString =
|
|
58
|
-
encodedUrl = "".concat(
|
|
51
|
+
queryString = buildQueryParams(SupportConversationParameters);
|
|
52
|
+
encodedUrl = "".concat(urlsConfig.values.CORE_BASE_URL).concat(route).concat(queryString);
|
|
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 fetchSupportConversationByUser(SupportConversationParameters) {
|
|
|
72
66
|
return [2 /*return*/, { result: response.data }];
|
|
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 fetchSupportConversationByUser(SupportConversationParameters) {
|
|
|
84
78
|
});
|
|
85
79
|
});
|
|
86
80
|
}
|
|
87
|
-
exports.fetchSupportConversationByUser = fetchSupportConversationByUser;
|
|
88
81
|
function fetchSupportConversationByGuest(SupportConversationParameters) {
|
|
89
82
|
var _a, _b;
|
|
90
83
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -93,14 +86,14 @@ function fetchSupportConversationByGuest(SupportConversationParameters) {
|
|
|
93
86
|
switch (_c.label) {
|
|
94
87
|
case 0:
|
|
95
88
|
route = "/api/SupportConversation/GetByGuest";
|
|
96
|
-
if (!
|
|
89
|
+
if (!urlsConfig.values)
|
|
97
90
|
throw Error("No urls config found");
|
|
98
|
-
queryString =
|
|
99
|
-
encodedUrl = "".concat(
|
|
91
|
+
queryString = buildQueryParams(SupportConversationParameters);
|
|
92
|
+
encodedUrl = "".concat(urlsConfig.values.CORE_BASE_URL).concat(route).concat(queryString);
|
|
100
93
|
_c.label = 1;
|
|
101
94
|
case 1:
|
|
102
95
|
_c.trys.push([1, 3, , 4]);
|
|
103
|
-
return [4 /*yield*/,
|
|
96
|
+
return [4 /*yield*/, Axios.get(encodedUrl, {
|
|
104
97
|
headers: {
|
|
105
98
|
"Content-Type": "application/json;charset=utf-8",
|
|
106
99
|
"Access-Control-Allow-Origin": "http://localhost:3000",
|
|
@@ -113,7 +106,7 @@ function fetchSupportConversationByGuest(SupportConversationParameters) {
|
|
|
113
106
|
return [2 /*return*/, { result: response.data }];
|
|
114
107
|
case 3:
|
|
115
108
|
exception_2 = _c.sent();
|
|
116
|
-
if (
|
|
109
|
+
if (axios.isAxiosError(exception_2)) {
|
|
117
110
|
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 }];
|
|
118
111
|
}
|
|
119
112
|
else {
|
|
@@ -125,7 +118,6 @@ function fetchSupportConversationByGuest(SupportConversationParameters) {
|
|
|
125
118
|
});
|
|
126
119
|
});
|
|
127
120
|
}
|
|
128
|
-
exports.fetchSupportConversationByGuest = fetchSupportConversationByGuest;
|
|
129
121
|
function addNewSupportConversation(newSupportConversation) {
|
|
130
122
|
var _a, _b;
|
|
131
123
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -134,13 +126,13 @@ function addNewSupportConversation(newSupportConversation) {
|
|
|
134
126
|
switch (_c.label) {
|
|
135
127
|
case 0:
|
|
136
128
|
route = "/api/SupportConversation/insert";
|
|
137
|
-
if (!
|
|
129
|
+
if (!urlsConfig.values)
|
|
138
130
|
throw Error("No urls config found");
|
|
139
|
-
url = "".concat(
|
|
131
|
+
url = "".concat(urlsConfig.values.CORE_BASE_URL).concat(route);
|
|
140
132
|
_c.label = 1;
|
|
141
133
|
case 1:
|
|
142
134
|
_c.trys.push([1, 3, , 4]);
|
|
143
|
-
return [4 /*yield*/,
|
|
135
|
+
return [4 /*yield*/, Axios.post(url, newSupportConversation, {
|
|
144
136
|
headers: {
|
|
145
137
|
"Content-Type": "application/json;",
|
|
146
138
|
},
|
|
@@ -150,7 +142,7 @@ function addNewSupportConversation(newSupportConversation) {
|
|
|
150
142
|
return [2 /*return*/, { result: response.data, success: true }];
|
|
151
143
|
case 3:
|
|
152
144
|
exception_3 = _c.sent();
|
|
153
|
-
if (
|
|
145
|
+
if (axios.isAxiosError(exception_3)) {
|
|
154
146
|
return [2 /*return*/, { success: false, error: (_a = exception_3.response) === null || _a === void 0 ? void 0 : _a.data, statusCode: (_b = exception_3.response) === null || _b === void 0 ? void 0 : _b.status }];
|
|
155
147
|
}
|
|
156
148
|
else {
|
|
@@ -162,7 +154,6 @@ function addNewSupportConversation(newSupportConversation) {
|
|
|
162
154
|
});
|
|
163
155
|
});
|
|
164
156
|
}
|
|
165
|
-
exports.addNewSupportConversation = addNewSupportConversation;
|
|
166
157
|
function updateSupportConversation(updateSupportConversation) {
|
|
167
158
|
var _a, _b;
|
|
168
159
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -171,13 +162,13 @@ function updateSupportConversation(updateSupportConversation) {
|
|
|
171
162
|
switch (_c.label) {
|
|
172
163
|
case 0:
|
|
173
164
|
route = "/api/SupportConversation/update";
|
|
174
|
-
if (!
|
|
165
|
+
if (!urlsConfig.values)
|
|
175
166
|
throw Error("No urls config found");
|
|
176
|
-
url = "".concat(
|
|
167
|
+
url = "".concat(urlsConfig.values.CORE_BASE_URL).concat(route);
|
|
177
168
|
_c.label = 1;
|
|
178
169
|
case 1:
|
|
179
170
|
_c.trys.push([1, 3, , 4]);
|
|
180
|
-
return [4 /*yield*/,
|
|
171
|
+
return [4 /*yield*/, Axios.put(url, updateSupportConversation, {
|
|
181
172
|
headers: {
|
|
182
173
|
"Content-Type": "application/json;",
|
|
183
174
|
},
|
|
@@ -187,7 +178,7 @@ function updateSupportConversation(updateSupportConversation) {
|
|
|
187
178
|
return [2 /*return*/, { result: response.data, success: true }];
|
|
188
179
|
case 3:
|
|
189
180
|
exception_4 = _c.sent();
|
|
190
|
-
if (
|
|
181
|
+
if (axios.isAxiosError(exception_4)) {
|
|
191
182
|
return [2 /*return*/, { success: false, error: (_a = exception_4.response) === null || _a === void 0 ? void 0 : _a.data, statusCode: (_b = exception_4.response) === null || _b === void 0 ? void 0 : _b.status }];
|
|
192
183
|
}
|
|
193
184
|
else {
|
|
@@ -199,4 +190,4 @@ function updateSupportConversation(updateSupportConversation) {
|
|
|
199
190
|
});
|
|
200
191
|
});
|
|
201
192
|
}
|
|
202
|
-
|
|
193
|
+
export { addNewSupportConversation, fetchSupportConversationByGuest, fetchSupportConversationByUser, updateSupportConversation };
|
|
@@ -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
|
getSupportConversationByUser: {
|
|
22
19
|
loading: false,
|
|
23
20
|
success: false,
|
|
@@ -128,10 +125,10 @@ var SupportConversationState = /** @class */ (function (_super) {
|
|
|
128
125
|
this.draftState.updateSupportConversation.technicalErrorMessage = technicalErrorMessage;
|
|
129
126
|
};
|
|
130
127
|
SupportConversationState.prototype.reset = function () {
|
|
131
|
-
this.draftState =
|
|
128
|
+
this.draftState = initialState;
|
|
132
129
|
};
|
|
133
130
|
return SupportConversationState;
|
|
134
|
-
}(
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
131
|
+
}(ImmerReducer));
|
|
132
|
+
export { SupportConversationState };
|
|
133
|
+
export var SupportConversationActions = createActionCreators(SupportConversationState);
|
|
134
|
+
export var SupportConversationReducerFunction = createReducerFunction(SupportConversationState, 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_support-conversation",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.11",
|
|
4
4
|
"description": "supportconversation 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"
|