@zeniai/client-epic-state 4.10.11 → 4.10.13
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/entity/jeSchedules/jeSchedulesReducer.d.ts +3 -1
- package/lib/entity/jeSchedules/jeSchedulesReducer.js +4 -3
- package/lib/entity/jeSchedules/jeSchedulesTypes.d.ts +1 -1
- package/lib/entity/jeSchedules/jeSchedulesTypes.js +6 -1
- package/lib/entity/snackbar/snackbarTypes.d.ts +1 -1
- package/lib/entity/snackbar/snackbarTypes.js +1 -0
- package/lib/entity/tenant/tenantPayload.d.ts +3 -0
- package/lib/entity/tenant/tenantReducer.js +5 -0
- package/lib/entity/tenant/tenantSelector.d.ts +2 -0
- package/lib/entity/tenant/tenantSelector.js +11 -1
- package/lib/entity/tenant/tenantState.d.ts +5 -0
- package/lib/epic.d.ts +2 -1
- package/lib/epic.js +2 -1
- package/lib/index.d.ts +4 -4
- package/lib/index.js +25 -20
- package/lib/view/people/changeZeniPersonRolesEpic.d.ts +1 -1
- package/lib/view/people/deletePersonEpic.d.ts +1 -1
- package/lib/view/people/fetchAllPeopleRequiredViewsEpic.js +7 -4
- package/lib/view/people/invitePeopleEpic.d.ts +1 -1
- package/lib/view/people/inviteZeniPeopleEpic.d.ts +1 -1
- package/lib/view/people/peopleReducer.d.ts +2 -1
- package/lib/view/people/peopleReducer.js +2 -2
- package/lib/view/people/resendInviteEpic.d.ts +1 -1
- package/lib/view/scheduleView/scheduleDetailView/epics/createNewSchedulesEpic.js +5 -3
- package/lib/view/scheduleView/scheduleDetailView/epics/deleteScheduleDetailEpic.js +1 -1
- package/lib/view/scheduleView/scheduleDetailView/epics/markAsCompleteScheduleDetailEpic.d.ts +8 -0
- package/lib/view/scheduleView/scheduleDetailView/epics/markAsCompleteScheduleDetailEpic.js +70 -0
- package/lib/view/scheduleView/scheduleDetailView/epics/saveScheduleDetailsEpic.js +3 -1
- package/lib/view/scheduleView/scheduleDetailView/scheduleDetailPayload.d.ts +4 -3
- package/lib/view/scheduleView/scheduleDetailView/scheduleDetailPayload.js +79 -15
- package/lib/view/scheduleView/scheduleDetailView/scheduleDetailReducer.d.ts +7 -1
- package/lib/view/scheduleView/scheduleDetailView/scheduleDetailReducer.js +41 -2
- package/lib/view/scheduleView/scheduleDetailView/scheduleDetailSelector.d.ts +1 -0
- package/lib/view/scheduleView/scheduleDetailView/scheduleDetailSelector.js +2 -0
- package/lib/view/scheduleView/scheduleDetailView/scheduleDetailState.d.ts +1 -0
- package/lib/view/scheduleView/scheduleListView/scheduleListSelector.js +2 -1
- package/lib/view/settingsView/epic/fetchMyProfileViewEpic.js +7 -4
- package/lib/view/settingsView/epic/saveNotificationSettingsEpic.d.ts +1 -1
- package/lib/view/settingsView/settingsViewHelpers.d.ts +2 -2
- package/lib/view/settingsView/settingsViewHelpers.js +25 -16
- package/lib/view/settingsView/settingsViewReducer.d.ts +2 -1
- package/lib/view/settingsView/settingsViewReducer.js +2 -2
- package/lib/view/settingsView/settingsViewSelector.d.ts +1 -1
- package/lib/view/settingsView/settingsViewSelector.js +8 -6
- package/package.json +1 -1
|
@@ -71,10 +71,49 @@ const mapJEScheduleLocalDataToScheduleDetailPayload = (jeScheduleDetails, jeSche
|
|
|
71
71
|
: [];
|
|
72
72
|
};
|
|
73
73
|
exports.mapJEScheduleLocalDataToScheduleDetailPayload = mapJEScheduleLocalDataToScheduleDetailPayload;
|
|
74
|
-
const
|
|
75
|
-
|
|
76
|
-
|
|
74
|
+
const getBalanceAmountAsOfToday = ({ isMarkAsComplete, balanceAsOfToday, baseTransaction, }) => {
|
|
75
|
+
if (isMarkAsComplete === true) {
|
|
76
|
+
return 0;
|
|
77
|
+
}
|
|
78
|
+
if (balanceAsOfToday != null) {
|
|
79
|
+
return balanceAsOfToday.amount;
|
|
80
|
+
}
|
|
81
|
+
return baseTransaction.amount.amount;
|
|
82
|
+
};
|
|
83
|
+
const getJECreditAccountingClassId = ({ jeScheduleTransactionState, isMarkAsComplete, }) => {
|
|
84
|
+
var _a, _b, _c, _d;
|
|
85
|
+
const { baseTransaction, jeCredit } = jeScheduleTransactionState;
|
|
86
|
+
if (isMarkAsComplete === true) {
|
|
87
|
+
return null;
|
|
88
|
+
}
|
|
89
|
+
return ((_d = (_b = (_a = jeCredit.accountingClass) === null || _a === void 0 ? void 0 : _a.classId) !== null && _b !== void 0 ? _b : (_c = baseTransaction.classBase) === null || _c === void 0 ? void 0 : _c.classId) !== null && _d !== void 0 ? _d : null);
|
|
90
|
+
};
|
|
91
|
+
const getJECreditAccountId = ({ isMarkAsComplete, jeScheduleTransactionState, }) => {
|
|
92
|
+
var _a, _b;
|
|
93
|
+
const { baseTransaction, jeCredit } = jeScheduleTransactionState;
|
|
94
|
+
if (isMarkAsComplete === true) {
|
|
95
|
+
return null;
|
|
96
|
+
}
|
|
97
|
+
return (_b = (_a = jeCredit.account) === null || _a === void 0 ? void 0 : _a.accountId) !== null && _b !== void 0 ? _b : baseTransaction.account.accountId;
|
|
98
|
+
};
|
|
99
|
+
const mapJEScheduleTransactionToPayload = (jeScheduleTransactionState, vendorState, scheduleDetailsLocalData, jeScheduleType, isDelete, isMarkAsComplete) => {
|
|
100
|
+
var _a, _b;
|
|
101
|
+
const { vendor, currencyCode, currencySymbol, baseTransaction, status, startDate, endDate, balanceAsOfToday, jeScheduleId, } = jeScheduleTransactionState;
|
|
77
102
|
const { selectedMonths, selectedAccount, selectedClass, selectedDayOfMonth, lastDayOfMonth, } = scheduleDetailsLocalData;
|
|
103
|
+
let updatedStatus = Object.assign({}, status);
|
|
104
|
+
// if the current status is marked as completed, we need to send the status as new when creating a new schedule.
|
|
105
|
+
if (status.code === 'marked_as_completed') {
|
|
106
|
+
updatedStatus = {
|
|
107
|
+
code: 'new',
|
|
108
|
+
label: 'New',
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
if (isMarkAsComplete === true) {
|
|
112
|
+
updatedStatus = {
|
|
113
|
+
code: 'marked_as_completed',
|
|
114
|
+
label: 'Marked as Completed',
|
|
115
|
+
};
|
|
116
|
+
}
|
|
78
117
|
const postingDate = selectedDayOfMonth !== null && selectedDayOfMonth !== void 0 ? selectedDayOfMonth : (lastDayOfMonth != null ? timePeriod_1.LAST_SCHEDULE_DAY_OF_MONTH : null);
|
|
79
118
|
const scheduleLength = scheduleDetailsLocalData.jeScheduleDetails.length;
|
|
80
119
|
const firstJEScheduleDate = scheduleLength > 0
|
|
@@ -86,20 +125,29 @@ const mapJEScheduleTransactionToPayload = (jeScheduleTransactionState, vendorSta
|
|
|
86
125
|
const vendorID = vendor.id;
|
|
87
126
|
const vendorDetails = vendorState.vendorByID[vendorID];
|
|
88
127
|
const payload = {
|
|
89
|
-
status,
|
|
128
|
+
status: updatedStatus,
|
|
90
129
|
vendor: (0, exports.mapVendorToVendorPayload)(vendorDetails),
|
|
91
130
|
currency_code: currencyCode,
|
|
92
131
|
currency_symbol: currencySymbol,
|
|
93
132
|
period: selectedMonths !== null && selectedMonths !== void 0 ? selectedMonths : null,
|
|
94
133
|
je_schedule_type: jeScheduleType,
|
|
95
134
|
posting_date: postingDate,
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
135
|
+
je_schedule_id: status.code === 'marked_as_completed' ? jeScheduleId : undefined,
|
|
136
|
+
balance: getBalanceAmountAsOfToday({
|
|
137
|
+
isMarkAsComplete,
|
|
138
|
+
balanceAsOfToday,
|
|
139
|
+
baseTransaction,
|
|
140
|
+
}),
|
|
99
141
|
start_date: (_a = startDate === null || startDate === void 0 ? void 0 : startDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT)) !== null && _a !== void 0 ? _a : firstJEScheduleDate,
|
|
100
142
|
end_date: (_b = endDate === null || endDate === void 0 ? void 0 : endDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT)) !== null && _b !== void 0 ? _b : lastJEScheduleDate,
|
|
101
|
-
je_credit_accounting_class_id: (
|
|
102
|
-
|
|
143
|
+
je_credit_accounting_class_id: getJECreditAccountingClassId({
|
|
144
|
+
isMarkAsComplete,
|
|
145
|
+
jeScheduleTransactionState,
|
|
146
|
+
}),
|
|
147
|
+
je_credit_account_id: getJECreditAccountId({
|
|
148
|
+
isMarkAsComplete,
|
|
149
|
+
jeScheduleTransactionState,
|
|
150
|
+
}),
|
|
103
151
|
je_debit_account_id: selectedAccount !== null && selectedAccount !== void 0 ? selectedAccount : null,
|
|
104
152
|
je_debit_accounting_class_id: selectedClass !== null && selectedClass !== void 0 ? selectedClass : null,
|
|
105
153
|
other_attributes: {},
|
|
@@ -109,10 +157,24 @@ const mapJEScheduleTransactionToPayload = (jeScheduleTransactionState, vendorSta
|
|
|
109
157
|
? Object.assign(Object.assign({}, payload), { is_deleted: true }) : payload;
|
|
110
158
|
};
|
|
111
159
|
exports.mapJEScheduleTransactionToPayload = mapJEScheduleTransactionToPayload;
|
|
112
|
-
const mapFixedAssetJEScheduleTransactionToPayload = (jeScheduleTransactionState, vendorState, scheduleDetailsLocalData, isDelete) => {
|
|
160
|
+
const mapFixedAssetJEScheduleTransactionToPayload = (jeScheduleTransactionState, vendorState, scheduleDetailsLocalData, isDelete, isMarkAsComplete) => {
|
|
113
161
|
var _a, _b, _c, _d, _e, _f;
|
|
114
162
|
const { vendor, currencyCode, currencySymbol, baseTransaction, status, startDate, endDate, balanceAsOfToday, jeCredit, } = jeScheduleTransactionState;
|
|
115
163
|
const { selectedMonths, selectedAccount, selectedClass, selectedDayOfMonth, lastDayOfMonth, selectedAccumulatedDepreciationCategory, assetId, } = scheduleDetailsLocalData;
|
|
164
|
+
let updatedStatus = Object.assign({}, status);
|
|
165
|
+
// if the current status is marked as completed, we need to send the status as new when creating a new schedule.
|
|
166
|
+
if (status.code === 'marked_as_completed') {
|
|
167
|
+
updatedStatus = {
|
|
168
|
+
code: 'new',
|
|
169
|
+
label: 'New',
|
|
170
|
+
};
|
|
171
|
+
}
|
|
172
|
+
if (isMarkAsComplete === true) {
|
|
173
|
+
updatedStatus = {
|
|
174
|
+
code: 'marked_as_completed',
|
|
175
|
+
label: 'Marked as Completed',
|
|
176
|
+
};
|
|
177
|
+
}
|
|
116
178
|
const postingDate = selectedDayOfMonth !== null && selectedDayOfMonth !== void 0 ? selectedDayOfMonth : (lastDayOfMonth != null ? timePeriod_1.LAST_SCHEDULE_DAY_OF_MONTH : null);
|
|
117
179
|
const scheduleLength = scheduleDetailsLocalData.jeScheduleDetails.length;
|
|
118
180
|
const firstJEScheduleDate = scheduleLength > 0
|
|
@@ -124,7 +186,7 @@ const mapFixedAssetJEScheduleTransactionToPayload = (jeScheduleTransactionState,
|
|
|
124
186
|
const vendorID = vendor.id;
|
|
125
187
|
const vendorDetails = vendorState.vendorByID[vendorID];
|
|
126
188
|
const payload = {
|
|
127
|
-
status,
|
|
189
|
+
status: updatedStatus,
|
|
128
190
|
vendor: (0, exports.mapVendorToVendorPayload)(vendorDetails),
|
|
129
191
|
currency_code: currencyCode,
|
|
130
192
|
currency_symbol: currencySymbol,
|
|
@@ -151,7 +213,7 @@ const mapFixedAssetJEScheduleTransactionToPayload = (jeScheduleTransactionState,
|
|
|
151
213
|
? Object.assign(Object.assign({}, payload), { is_deleted: true }) : payload;
|
|
152
214
|
};
|
|
153
215
|
exports.mapFixedAssetJEScheduleTransactionToPayload = mapFixedAssetJEScheduleTransactionToPayload;
|
|
154
|
-
const prepareScheduleDetailPayload = (state, scheduleDetailsLocalData, selectedJEScheduleKey, jeScheduleType, isDelete) => {
|
|
216
|
+
const prepareScheduleDetailPayload = (state, scheduleDetailsLocalData, selectedJEScheduleKey, jeScheduleType, isDelete, isMarkAsComplete) => {
|
|
155
217
|
const payload = {
|
|
156
218
|
je_schedules: [],
|
|
157
219
|
scheduled_journal_entries: [],
|
|
@@ -162,13 +224,15 @@ const prepareScheduleDetailPayload = (state, scheduleDetailsLocalData, selectedJ
|
|
|
162
224
|
payload.je_schedules =
|
|
163
225
|
jeScheduleType !== 'fixed_assets'
|
|
164
226
|
? [
|
|
165
|
-
(0, exports.mapJEScheduleTransactionToPayload)(jeScheduleTransactionState, vendorState, scheduleDetailsLocalData, jeScheduleType, isDelete),
|
|
227
|
+
(0, exports.mapJEScheduleTransactionToPayload)(jeScheduleTransactionState, vendorState, scheduleDetailsLocalData, jeScheduleType, isDelete, isMarkAsComplete),
|
|
166
228
|
]
|
|
167
229
|
: [
|
|
168
|
-
(0, exports.mapFixedAssetJEScheduleTransactionToPayload)(jeScheduleTransactionState, vendorState, scheduleDetailsLocalData, isDelete),
|
|
230
|
+
(0, exports.mapFixedAssetJEScheduleTransactionToPayload)(jeScheduleTransactionState, vendorState, scheduleDetailsLocalData, isDelete, isMarkAsComplete),
|
|
169
231
|
];
|
|
170
232
|
payload.scheduled_journal_entries =
|
|
171
|
-
|
|
233
|
+
isMarkAsComplete === true
|
|
234
|
+
? []
|
|
235
|
+
: (0, exports.mapJEScheduleLocalDataToScheduleDetailPayload)(jeScheduleDetailsLocalData, jeScheduleTransactionState, isDelete);
|
|
172
236
|
return payload;
|
|
173
237
|
};
|
|
174
238
|
exports.prepareScheduleDetailPayload = prepareScheduleDetailPayload;
|
|
@@ -64,6 +64,12 @@ export declare const createNewSchedules: import("@reduxjs/toolkit").ActionCreato
|
|
|
64
64
|
jeScheduleDetailId: ID;
|
|
65
65
|
rowId: number;
|
|
66
66
|
originalScheduledJE: ScheduledJournalEntry;
|
|
67
|
-
}, string>,
|
|
67
|
+
}, string>, markAsCompleteScheduleDetail: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", jeScheduleKey: `${string}_expense` | `${string}_invoice` | `${string}_payment` | `${string}_credit_memo` | `${string}_sales_receipt` | `${string}_delayed_credit` | `${string}_delayed_charge` | `${string}_refund` | `${string}_check` | `${string}_bill` | `${string}_bill_payment` | `${string}_bill_payment_check` | `${string}_bill_payment_credit_card` | `${string}_vendor_credit` | `${string}_credit_card_credit` | `${string}_transfer` | `${string}_credit_card_payment` | `${string}_deposit` | `${string}_journal_entry`], {
|
|
68
|
+
scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
|
|
69
|
+
jeScheduleKey: `${string}_expense` | `${string}_invoice` | `${string}_payment` | `${string}_credit_memo` | `${string}_sales_receipt` | `${string}_delayed_credit` | `${string}_delayed_charge` | `${string}_refund` | `${string}_check` | `${string}_bill` | `${string}_bill_payment` | `${string}_bill_payment_check` | `${string}_bill_payment_credit_card` | `${string}_vendor_credit` | `${string}_credit_card_credit` | `${string}_transfer` | `${string}_credit_card_payment` | `${string}_deposit` | `${string}_journal_entry`;
|
|
70
|
+
}, string, never, never>, markAsCompleteScheduleDetailSuccessOrFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[fetchState: FetchState, error?: ZeniAPIStatus<Record<string, unknown>> | undefined], {
|
|
71
|
+
fetchState: FetchState;
|
|
72
|
+
error: ZeniAPIStatus<Record<string, unknown>> | undefined;
|
|
73
|
+
}, string, never, never>, resetMarkAsCompleteStatus: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, clearScheduleDetailView: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
|
|
68
74
|
declare const _default: import("@reduxjs/toolkit").Reducer<ScheduleDetailViewState, import("@reduxjs/toolkit").AnyAction>;
|
|
69
75
|
export default _default;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var _a;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.clearScheduleDetailView = exports.resetJELinkInLocalData = exports.updatedJELinkWithRecommendedLocalData = exports.updatedSelectedJELinkRowIndex = exports.updateSelectedJEScheduleKey = exports.updateScheduleDetailNewStateLocalData = exports.updateAmountsInScheduleDetail = exports.updatedJELinkInLocalData = exports.updateScheduleDetailsLocalData = exports.initializeScheduleDetailLocalData = exports.deleteScheduleDetailSuccessOrFailure = exports.updateDeletedScheduleDetail = exports.deleteScheduleDetail = exports.saveScheduleDetailsSuccessOrFailure = exports.saveScheduleDetails = exports.updateScheduleDetailsFailure = exports.updateScheduleDetailsSuccess = exports.fetchScheduleDetails = exports.fetchScheduleDetailsPage = exports.createNewSchedules = exports.initialState = exports.initialScheduleDetailsLocalData = void 0;
|
|
4
|
+
exports.clearScheduleDetailView = exports.resetMarkAsCompleteStatus = exports.markAsCompleteScheduleDetailSuccessOrFailure = exports.markAsCompleteScheduleDetail = exports.resetJELinkInLocalData = exports.updatedJELinkWithRecommendedLocalData = exports.updatedSelectedJELinkRowIndex = exports.updateSelectedJEScheduleKey = exports.updateScheduleDetailNewStateLocalData = exports.updateAmountsInScheduleDetail = exports.updatedJELinkInLocalData = exports.updateScheduleDetailsLocalData = exports.initializeScheduleDetailLocalData = exports.deleteScheduleDetailSuccessOrFailure = exports.updateDeletedScheduleDetail = exports.deleteScheduleDetail = exports.saveScheduleDetailsSuccessOrFailure = exports.saveScheduleDetails = exports.updateScheduleDetailsFailure = exports.updateScheduleDetailsSuccess = exports.fetchScheduleDetails = exports.fetchScheduleDetailsPage = exports.createNewSchedules = exports.initialState = exports.initialScheduleDetailsLocalData = void 0;
|
|
5
5
|
const toolkit_1 = require("@reduxjs/toolkit");
|
|
6
6
|
const scheduleDetailLocalDataHelper_1 = require("./scheduleDetailLocalDataHelper");
|
|
7
7
|
const transactionDetailState_1 = require("../../transactionDetail/transactionDetailState");
|
|
@@ -44,6 +44,10 @@ exports.initialState = {
|
|
|
44
44
|
fetchState: 'Not-Started',
|
|
45
45
|
error: undefined,
|
|
46
46
|
},
|
|
47
|
+
markAsCompleteStatus: {
|
|
48
|
+
fetchState: 'Not-Started',
|
|
49
|
+
error: undefined,
|
|
50
|
+
},
|
|
47
51
|
uiState: {
|
|
48
52
|
sortKey: 'jePostingDate',
|
|
49
53
|
sortOrder: 'descending',
|
|
@@ -261,12 +265,47 @@ const scheduleDetailView = (0, toolkit_1.createSlice)({
|
|
|
261
265
|
};
|
|
262
266
|
},
|
|
263
267
|
},
|
|
268
|
+
markAsCompleteScheduleDetail: {
|
|
269
|
+
prepare(scheduleType, jeScheduleKey) {
|
|
270
|
+
return {
|
|
271
|
+
payload: { scheduleType, jeScheduleKey },
|
|
272
|
+
};
|
|
273
|
+
},
|
|
274
|
+
reducer(draft) {
|
|
275
|
+
draft.markAsCompleteStatus = {
|
|
276
|
+
fetchState: 'In-Progress',
|
|
277
|
+
error: undefined,
|
|
278
|
+
};
|
|
279
|
+
},
|
|
280
|
+
},
|
|
281
|
+
markAsCompleteScheduleDetailSuccessOrFailure: {
|
|
282
|
+
reducer(draft, action) {
|
|
283
|
+
draft.markAsCompleteStatus = {
|
|
284
|
+
fetchState: action.payload.fetchState,
|
|
285
|
+
error: action.payload.error,
|
|
286
|
+
};
|
|
287
|
+
},
|
|
288
|
+
prepare(fetchState, error) {
|
|
289
|
+
return {
|
|
290
|
+
payload: {
|
|
291
|
+
fetchState,
|
|
292
|
+
error,
|
|
293
|
+
},
|
|
294
|
+
};
|
|
295
|
+
},
|
|
296
|
+
},
|
|
297
|
+
resetMarkAsCompleteStatus(draft) {
|
|
298
|
+
draft.markAsCompleteStatus = {
|
|
299
|
+
fetchState: 'Not-Started',
|
|
300
|
+
error: undefined,
|
|
301
|
+
};
|
|
302
|
+
},
|
|
264
303
|
clearScheduleDetailView(draft) {
|
|
265
304
|
Object.assign(draft, exports.initialState);
|
|
266
305
|
},
|
|
267
306
|
},
|
|
268
307
|
});
|
|
269
|
-
_a = scheduleDetailView.actions, exports.createNewSchedules = _a.createNewSchedules, exports.fetchScheduleDetailsPage = _a.fetchScheduleDetailsPage, exports.fetchScheduleDetails = _a.fetchScheduleDetails, exports.updateScheduleDetailsSuccess = _a.updateScheduleDetailsSuccess, exports.updateScheduleDetailsFailure = _a.updateScheduleDetailsFailure, exports.saveScheduleDetails = _a.saveScheduleDetails, exports.saveScheduleDetailsSuccessOrFailure = _a.saveScheduleDetailsSuccessOrFailure, exports.deleteScheduleDetail = _a.deleteScheduleDetail, exports.updateDeletedScheduleDetail = _a.updateDeletedScheduleDetail, exports.deleteScheduleDetailSuccessOrFailure = _a.deleteScheduleDetailSuccessOrFailure, exports.initializeScheduleDetailLocalData = _a.initializeScheduleDetailLocalData, exports.updateScheduleDetailsLocalData = _a.updateScheduleDetailsLocalData, exports.updatedJELinkInLocalData = _a.updatedJELinkInLocalData, exports.updateAmountsInScheduleDetail = _a.updateAmountsInScheduleDetail, exports.updateScheduleDetailNewStateLocalData = _a.updateScheduleDetailNewStateLocalData, exports.updateSelectedJEScheduleKey = _a.updateSelectedJEScheduleKey, exports.updatedSelectedJELinkRowIndex = _a.updatedSelectedJELinkRowIndex, exports.updatedJELinkWithRecommendedLocalData = _a.updatedJELinkWithRecommendedLocalData, exports.resetJELinkInLocalData = _a.resetJELinkInLocalData, exports.clearScheduleDetailView = _a.clearScheduleDetailView;
|
|
308
|
+
_a = scheduleDetailView.actions, exports.createNewSchedules = _a.createNewSchedules, exports.fetchScheduleDetailsPage = _a.fetchScheduleDetailsPage, exports.fetchScheduleDetails = _a.fetchScheduleDetails, exports.updateScheduleDetailsSuccess = _a.updateScheduleDetailsSuccess, exports.updateScheduleDetailsFailure = _a.updateScheduleDetailsFailure, exports.saveScheduleDetails = _a.saveScheduleDetails, exports.saveScheduleDetailsSuccessOrFailure = _a.saveScheduleDetailsSuccessOrFailure, exports.deleteScheduleDetail = _a.deleteScheduleDetail, exports.updateDeletedScheduleDetail = _a.updateDeletedScheduleDetail, exports.deleteScheduleDetailSuccessOrFailure = _a.deleteScheduleDetailSuccessOrFailure, exports.initializeScheduleDetailLocalData = _a.initializeScheduleDetailLocalData, exports.updateScheduleDetailsLocalData = _a.updateScheduleDetailsLocalData, exports.updatedJELinkInLocalData = _a.updatedJELinkInLocalData, exports.updateAmountsInScheduleDetail = _a.updateAmountsInScheduleDetail, exports.updateScheduleDetailNewStateLocalData = _a.updateScheduleDetailNewStateLocalData, exports.updateSelectedJEScheduleKey = _a.updateSelectedJEScheduleKey, exports.updatedSelectedJELinkRowIndex = _a.updatedSelectedJELinkRowIndex, exports.updatedJELinkWithRecommendedLocalData = _a.updatedJELinkWithRecommendedLocalData, exports.resetJELinkInLocalData = _a.resetJELinkInLocalData, exports.markAsCompleteScheduleDetail = _a.markAsCompleteScheduleDetail, exports.markAsCompleteScheduleDetailSuccessOrFailure = _a.markAsCompleteScheduleDetailSuccessOrFailure, exports.resetMarkAsCompleteStatus = _a.resetMarkAsCompleteStatus, exports.clearScheduleDetailView = _a.clearScheduleDetailView;
|
|
270
309
|
exports.default = scheduleDetailView.reducer;
|
|
271
310
|
const updateJELinkInScheduleDetails = (jeScheduleDetailsLocalData, rowId, jeLink) => {
|
|
272
311
|
return jeScheduleDetailsLocalData.map((jeScheduleDetail, index) => {
|
|
@@ -21,6 +21,7 @@ export interface ScheduleDetailsView extends SelectorView {
|
|
|
21
21
|
uiState: ScheduleDetailUIState;
|
|
22
22
|
updateStatus: FetchStateAndError;
|
|
23
23
|
deleteStatus: FetchStateAndError;
|
|
24
|
+
markAsCompleteStatus: FetchStateAndError;
|
|
24
25
|
scheduleDetailsLocalData: {
|
|
25
26
|
prepaid_expenses: ScheduleDetailsLocalData;
|
|
26
27
|
deferred_revenue: ScheduleDetailsLocalData;
|
|
@@ -35,6 +35,7 @@ const getScheduleDetailsView = (state, scheduleType) => {
|
|
|
35
35
|
error: scheduleDetailState.error,
|
|
36
36
|
updateStatus: scheduleDetailState.updateStatus,
|
|
37
37
|
deleteStatus: scheduleDetailState.deleteStatus,
|
|
38
|
+
markAsCompleteStatus: scheduleDetailState.markAsCompleteStatus,
|
|
38
39
|
};
|
|
39
40
|
}
|
|
40
41
|
const jeScheduleTransactionState = (0, jeSchedulesSelector_1.getJEScheduledTransactionByJEScheduleKey)(jeScheduleKey, state);
|
|
@@ -94,6 +95,7 @@ const getScheduleDetailsView = (state, scheduleType) => {
|
|
|
94
95
|
error: fetchState.error,
|
|
95
96
|
updateStatus: scheduleDetailState.updateStatus,
|
|
96
97
|
deleteStatus: scheduleDetailState.deleteStatus,
|
|
98
|
+
markAsCompleteStatus: scheduleDetailState.markAsCompleteStatus,
|
|
97
99
|
};
|
|
98
100
|
};
|
|
99
101
|
exports.getScheduleDetailsView = getScheduleDetailsView;
|
|
@@ -55,6 +55,7 @@ export interface ScheduleDetailViewState extends FetchStateAndError {
|
|
|
55
55
|
};
|
|
56
56
|
updateStatus: FetchStateAndError;
|
|
57
57
|
deleteStatus: FetchStateAndError;
|
|
58
|
+
markAsCompleteStatus: FetchStateAndError;
|
|
58
59
|
uiState: ScheduleDetailUIState;
|
|
59
60
|
selectedDetailScheduleType?: ScheduleTypes;
|
|
60
61
|
selectedJEScheduleKey?: JEScheduleKey;
|
|
@@ -143,7 +143,8 @@ const getScheduleListReport = (state, scheduleType) => {
|
|
|
143
143
|
jeTransactionsView = currentTabTransactions.filter((tran) => tran.status.code === 'ongoing');
|
|
144
144
|
break;
|
|
145
145
|
case 'completed':
|
|
146
|
-
jeTransactionsView = currentTabTransactions.filter((tran) => tran.status.code === 'completed'
|
|
146
|
+
jeTransactionsView = currentTabTransactions.filter((tran) => tran.status.code === 'completed' ||
|
|
147
|
+
tran.status.code === 'marked_as_completed');
|
|
147
148
|
break;
|
|
148
149
|
default:
|
|
149
150
|
jeTransactionsView = currentTabTransactions;
|
|
@@ -7,11 +7,14 @@ const settingsViewReducer_1 = require("../settingsViewReducer");
|
|
|
7
7
|
const companyViewReducer_1 = require("../../companyView/companyViewReducer");
|
|
8
8
|
const classListReducer_1 = require("../../classList/classListReducer");
|
|
9
9
|
const fetchMyProfileViewEpic = (actions$) => actions$.pipe((0, operators_1.filter)(settingsViewReducer_1.fetchMyProfileView.match), (0, operators_1.switchMap)((action) => {
|
|
10
|
-
const { companyId } = action.payload;
|
|
11
|
-
|
|
10
|
+
const { companyId, shouldFetchClassList } = action.payload;
|
|
11
|
+
const fetchMyProfileAction = [
|
|
12
12
|
(0, companyViewReducer_1.fetchCompanyPassportView)(companyId),
|
|
13
|
-
(0, classListReducer_1.fetchClassList)(),
|
|
14
13
|
(0, settingsViewReducer_1.fetchMyProfile)(),
|
|
15
|
-
]
|
|
14
|
+
];
|
|
15
|
+
if (shouldFetchClassList) {
|
|
16
|
+
fetchMyProfileAction.push((0, classListReducer_1.fetchClassList)());
|
|
17
|
+
}
|
|
18
|
+
return (0, rxjs_1.from)(fetchMyProfileAction);
|
|
16
19
|
}));
|
|
17
20
|
exports.fetchMyProfileViewEpic = fetchMyProfileViewEpic;
|
|
@@ -18,7 +18,7 @@ export declare const saveNotificationSettingsEpic: (actions$: ActionsObservable<
|
|
|
18
18
|
type: string;
|
|
19
19
|
} | {
|
|
20
20
|
payload: {
|
|
21
|
-
messageSection: "common" | "transactionDetails_updatingPastTransactions" | "transactionDetails_transactionUpdated" | "cockpit_month_end_email_sent" | "cockpit_month_end_email_save" | "cockpit_month_end_email_attachment_upload" | "people_invite_people" | "people_invite_multiple_people" | "people_delete_person" | "people_update_person" | "reimbursement_updated" | "reimbursement_deleted" | "reimbursement_cancelled_deleted" | "reimbursement_cancelled" | "reimbursement_approved" | "reimbursement_rejected" | "reimbursement_sent_for_approval" | "account_added" | "business_verification_save" | "business_verification_submit" | "business_verification_from_bills_submit" | "plaid_connection" | "unlink_deposit_account" | "reimbursement_setup" | "reimbursement_approval_create" | "reimbursement_duplicate_approval_create" | "reimbursement_approval_update" | "reimbursement_duplicate_approval_update" | "reimbursement_approval_delete" | "reimbursement_create_mileage" | "reimbursement_update_mileage" | "reimbursement_accept_term" | "reimbursement_accept_employee_term" | "bill_pay_setup" | "zeni_accounts_setup" | "bill_pay_approval_create" | "bill_pay_duplicate_approval_create" | "bill_pay_approval_update" | "bill_pay_duplicate_approval_update" | "bill_pay_approval_delete" | "bill_pay_updated" | "bill_pay_deleted" | "bill_pay_cancelled_deleted" | "bill_pay_cancelled" | "bill_pay_approved" | "real_time_approver_added" | "bill_pay_rejected" | "bill_pay_sent_for_approval" | "bill_pay_accept_term" | "zeni_account_accept_term" | "update_vendor" | "delete_bank_account" | "create_bank_account" | "create_bank_account_ach" | "create_bank_account_wire" | "create_bank_account_international" | "transfer_money" | "update_zeni_account_nickname" | "create_checking_account" | "deposit_check" | "create_vendor" | "onboarding_customer_view" | "onboarding_customer_view_complete" | "onboarding_customer_identity_verification_save" | "onboarding_customer_identity_verification_submit" | "onboarding_customer_business_verification_save" | "onboarding_customer_business_verification_submit" | "retry_bank_account_connection" | "dashboard_invite_sent" | "onboarding_info_saved" | "approve_original_merchant" | "approve_global_merchant" | "reject_global_merchant" | "create_global_merchant" | "fetch_global_merchant_no_recommendation" | "save_vendor_renamed" | "save_vendor_sent_for_review" | "save_vendor_marked_as_employee" | "charge_card_setup" | "charge_card_accept_term" | "create_schedule" | "save_schedule" | "delete_schedule" | "save_task_detail" | "fetch_task_detail" | "delete_task" | "archive_task" | "update_charge_card" | "issue_charge_card" | "notification_settings_saved" | "referral_invite_sent" | "notification_mark_as_read" | "settings_accounting_accounts_updated";
|
|
21
|
+
messageSection: "common" | "transactionDetails_updatingPastTransactions" | "transactionDetails_transactionUpdated" | "cockpit_month_end_email_sent" | "cockpit_month_end_email_save" | "cockpit_month_end_email_attachment_upload" | "people_invite_people" | "people_invite_multiple_people" | "people_delete_person" | "people_update_person" | "reimbursement_updated" | "reimbursement_deleted" | "reimbursement_cancelled_deleted" | "reimbursement_cancelled" | "reimbursement_approved" | "reimbursement_rejected" | "reimbursement_sent_for_approval" | "account_added" | "business_verification_save" | "business_verification_submit" | "business_verification_from_bills_submit" | "plaid_connection" | "unlink_deposit_account" | "reimbursement_setup" | "reimbursement_approval_create" | "reimbursement_duplicate_approval_create" | "reimbursement_approval_update" | "reimbursement_duplicate_approval_update" | "reimbursement_approval_delete" | "reimbursement_create_mileage" | "reimbursement_update_mileage" | "reimbursement_accept_term" | "reimbursement_accept_employee_term" | "bill_pay_setup" | "zeni_accounts_setup" | "bill_pay_approval_create" | "bill_pay_duplicate_approval_create" | "bill_pay_approval_update" | "bill_pay_duplicate_approval_update" | "bill_pay_approval_delete" | "bill_pay_updated" | "bill_pay_deleted" | "bill_pay_cancelled_deleted" | "bill_pay_cancelled" | "bill_pay_approved" | "real_time_approver_added" | "bill_pay_rejected" | "bill_pay_sent_for_approval" | "bill_pay_accept_term" | "zeni_account_accept_term" | "update_vendor" | "delete_bank_account" | "create_bank_account" | "create_bank_account_ach" | "create_bank_account_wire" | "create_bank_account_international" | "transfer_money" | "update_zeni_account_nickname" | "create_checking_account" | "deposit_check" | "create_vendor" | "onboarding_customer_view" | "onboarding_customer_view_complete" | "onboarding_customer_identity_verification_save" | "onboarding_customer_identity_verification_submit" | "onboarding_customer_business_verification_save" | "onboarding_customer_business_verification_submit" | "retry_bank_account_connection" | "dashboard_invite_sent" | "onboarding_info_saved" | "approve_original_merchant" | "approve_global_merchant" | "reject_global_merchant" | "create_global_merchant" | "fetch_global_merchant_no_recommendation" | "save_vendor_renamed" | "save_vendor_sent_for_review" | "save_vendor_marked_as_employee" | "charge_card_setup" | "charge_card_accept_term" | "create_schedule" | "save_schedule" | "delete_schedule" | "save_task_detail" | "fetch_task_detail" | "delete_task" | "archive_task" | "update_charge_card" | "issue_charge_card" | "notification_settings_saved" | "referral_invite_sent" | "notification_mark_as_read" | "mark_as_complete_schedule" | "settings_accounting_accounts_updated";
|
|
22
22
|
messageText: "failed" | "success";
|
|
23
23
|
type: import("../../..").SnackbarMessageType;
|
|
24
24
|
showStatusIcon?: boolean | undefined;
|
|
@@ -7,8 +7,8 @@ export declare const isBankConnectionsTabVisible: (currentTenant: CurrentTenant
|
|
|
7
7
|
export declare const isBusinessVerificationTabVisible: (currentTenant: CurrentTenant | undefined, userRoleMap?: RoleMap | undefined) => boolean;
|
|
8
8
|
export declare const isCompanyDetailsTabVisible: (userRole: UserRoleType[], currentTenant: CurrentTenant | undefined, userRoleMap?: RoleMap | undefined) => boolean;
|
|
9
9
|
export declare const isIntegrationsTabVisible: (userRole: UserRoleType[], currentTenant: CurrentTenant | undefined) => boolean;
|
|
10
|
-
export declare const isSettingsVisible: (currentTenant: CurrentTenant
|
|
10
|
+
export declare const isSettingsVisible: (currentTenant: CurrentTenant) => boolean;
|
|
11
11
|
export declare const isMyBankConnectionsTabVisible: (currentTenant: CurrentTenant | undefined, userRoleMap?: RoleMap | undefined) => boolean;
|
|
12
12
|
export declare const isRemindersSectionVisibleOnSettingsPage: (reminderNotificationSettings: ReminderNotificationSettingsData) => boolean;
|
|
13
13
|
export declare const isMonthEndNotificationsSectionVisibleOnSettingsPage: (monthEndInsightsNotificationSettings: MonthEndInsightsNotificationSettingsData, signedInUseEmail: string) => boolean;
|
|
14
|
-
export declare const isNotificationsTabVisible: (notificationSettings: NotificationSettingsData, signedInUseEmail: string) => boolean;
|
|
14
|
+
export declare const isNotificationsTabVisible: (notificationSettings: NotificationSettingsData, signedInUseEmail: string, currentTenant: CurrentTenant | undefined) => boolean;
|
|
@@ -1,12 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isNotificationsTabVisible = exports.isMonthEndNotificationsSectionVisibleOnSettingsPage = exports.isRemindersSectionVisibleOnSettingsPage = exports.isMyBankConnectionsTabVisible = exports.isSettingsVisible = exports.isIntegrationsTabVisible = exports.isCompanyDetailsTabVisible = exports.isBusinessVerificationTabVisible = exports.isBankConnectionsTabVisible = exports.isApprovalRulesTabVisible = exports.isAccountingTabVisible = void 0;
|
|
4
|
+
const tenantSelector_1 = require("../../entity/tenant/tenantSelector");
|
|
4
5
|
const userRoleType_1 = require("../../entity/userRole/userRoleType");
|
|
5
6
|
const isAccountingTabVisible = (userRole, currentTenant, userRoleMap) => {
|
|
7
|
+
if (currentTenant == null) {
|
|
8
|
+
return false;
|
|
9
|
+
}
|
|
6
10
|
if ((0, exports.isSettingsVisible)(currentTenant)) {
|
|
7
|
-
return ((0, userRoleType_1.hasBillPayAccessible)(currentTenant, userRoleMap) ||
|
|
11
|
+
return (((0, userRoleType_1.hasBillPayAccessible)(currentTenant, userRoleMap) ||
|
|
8
12
|
(0, userRoleType_1.hasReimbursementAccessible)(currentTenant, userRoleMap) ||
|
|
9
|
-
(0, userRoleType_1.hasFullOrAdminLevelAccess)(userRole))
|
|
13
|
+
(0, userRoleType_1.hasFullOrAdminLevelAccess)(userRole)) &&
|
|
14
|
+
(0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false);
|
|
10
15
|
}
|
|
11
16
|
else {
|
|
12
17
|
return false;
|
|
@@ -21,10 +26,11 @@ const isApprovalRulesTabVisible = (userRole, currentTenant, userRoleMap) => {
|
|
|
21
26
|
if ((0, exports.isSettingsVisible)(currentTenant)) {
|
|
22
27
|
const isBillPayTOSAccepted = Boolean((_a = currentTenant.company) === null || _a === void 0 ? void 0 : _a.companyBillPayInfo.isBillPayTOSAccepted);
|
|
23
28
|
const isReimbursementTOSAccepted = Boolean((_b = currentTenant === null || currentTenant === void 0 ? void 0 : currentTenant.company) === null || _b === void 0 ? void 0 : _b.companyReimbursementInfo.isReimbursementTOSAccepted);
|
|
24
|
-
return ((0, userRoleType_1.hasBillPayAccessible)(currentTenant, userRoleMap) ||
|
|
29
|
+
return (((0, userRoleType_1.hasBillPayAccessible)(currentTenant, userRoleMap) ||
|
|
25
30
|
(0, userRoleType_1.hasReimbursementAccessible)(currentTenant, userRoleMap) ||
|
|
26
31
|
((isBillPayTOSAccepted || isReimbursementTOSAccepted) &&
|
|
27
|
-
(0, userRoleType_1.hasFullOrAdminLevelAccess)(userRole)))
|
|
32
|
+
(0, userRoleType_1.hasFullOrAdminLevelAccess)(userRole))) &&
|
|
33
|
+
(0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false);
|
|
28
34
|
}
|
|
29
35
|
else {
|
|
30
36
|
return false;
|
|
@@ -36,10 +42,11 @@ const isBankConnectionsTabVisible = (currentTenant, userRoleMap) => {
|
|
|
36
42
|
return false;
|
|
37
43
|
}
|
|
38
44
|
if ((0, exports.isSettingsVisible)(currentTenant)) {
|
|
39
|
-
return ((0, userRoleType_1.hasBillPayAccessible)(currentTenant, userRoleMap) ||
|
|
45
|
+
return (((0, userRoleType_1.hasBillPayAccessible)(currentTenant, userRoleMap) ||
|
|
40
46
|
(0, userRoleType_1.hasReimbursementAccessible)(currentTenant, userRoleMap) ||
|
|
41
47
|
(0, userRoleType_1.hasZeniAccountsAccessible)(currentTenant, userRoleMap) ||
|
|
42
|
-
(0, userRoleType_1.hasChargeCardAccessible)(currentTenant, userRoleMap))
|
|
48
|
+
(0, userRoleType_1.hasChargeCardAccessible)(currentTenant, userRoleMap)) &&
|
|
49
|
+
(0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false);
|
|
43
50
|
}
|
|
44
51
|
else {
|
|
45
52
|
return false;
|
|
@@ -76,8 +83,11 @@ const isCompanyDetailsTabVisible = (userRole, currentTenant, userRoleMap) => {
|
|
|
76
83
|
};
|
|
77
84
|
exports.isCompanyDetailsTabVisible = isCompanyDetailsTabVisible;
|
|
78
85
|
const isIntegrationsTabVisible = (userRole, currentTenant) => {
|
|
86
|
+
if (currentTenant == null) {
|
|
87
|
+
return false;
|
|
88
|
+
}
|
|
79
89
|
if ((0, exports.isSettingsVisible)(currentTenant)) {
|
|
80
|
-
return (0, userRoleType_1.hasFullOrAdminLevelAccess)(userRole);
|
|
90
|
+
return ((0, userRoleType_1.hasFullOrAdminLevelAccess)(userRole) && !(0, tenantSelector_1.isTenantBankingOnly)(currentTenant));
|
|
81
91
|
}
|
|
82
92
|
else {
|
|
83
93
|
return false;
|
|
@@ -86,12 +96,7 @@ const isIntegrationsTabVisible = (userRole, currentTenant) => {
|
|
|
86
96
|
exports.isIntegrationsTabVisible = isIntegrationsTabVisible;
|
|
87
97
|
const isSettingsVisible = (currentTenant) => {
|
|
88
98
|
var _a, _b;
|
|
89
|
-
|
|
90
|
-
return false;
|
|
91
|
-
}
|
|
92
|
-
else {
|
|
93
|
-
return ((_b = (_a = currentTenant.company) === null || _a === void 0 ? void 0 : _a.companyOnboardingInfo.isOnboardingCompleted) !== null && _b !== void 0 ? _b : false);
|
|
94
|
-
}
|
|
99
|
+
return ((_b = (_a = currentTenant.company) === null || _a === void 0 ? void 0 : _a.companyOnboardingInfo.isOnboardingCompleted) !== null && _b !== void 0 ? _b : false);
|
|
95
100
|
};
|
|
96
101
|
exports.isSettingsVisible = isSettingsVisible;
|
|
97
102
|
const isMyBankConnectionsTabVisible = (currentTenant, userRoleMap) => {
|
|
@@ -121,9 +126,13 @@ const isMonthEndNotificationsSectionVisibleOnSettingsPage = (monthEndInsightsNot
|
|
|
121
126
|
monthEndInsightsNotificationSettings.recipientEmailIds.includes(signedInUseEmail));
|
|
122
127
|
};
|
|
123
128
|
exports.isMonthEndNotificationsSectionVisibleOnSettingsPage = isMonthEndNotificationsSectionVisibleOnSettingsPage;
|
|
124
|
-
const isNotificationsTabVisible = (notificationSettings, signedInUseEmail) => {
|
|
129
|
+
const isNotificationsTabVisible = (notificationSettings, signedInUseEmail, currentTenant) => {
|
|
130
|
+
if (currentTenant == null) {
|
|
131
|
+
return false;
|
|
132
|
+
}
|
|
125
133
|
const { reminderNotificationSettings, monthEndInsightsNotificationSettings } = notificationSettings;
|
|
126
|
-
return ((0, exports.isRemindersSectionVisibleOnSettingsPage)(reminderNotificationSettings) ||
|
|
127
|
-
(0, exports.isMonthEndNotificationsSectionVisibleOnSettingsPage)(monthEndInsightsNotificationSettings, signedInUseEmail))
|
|
134
|
+
return (((0, exports.isRemindersSectionVisibleOnSettingsPage)(reminderNotificationSettings) ||
|
|
135
|
+
(0, exports.isMonthEndNotificationsSectionVisibleOnSettingsPage)(monthEndInsightsNotificationSettings, signedInUseEmail)) &&
|
|
136
|
+
(0, tenantSelector_1.isTenantBankingOnly)(currentTenant) === false);
|
|
128
137
|
};
|
|
129
138
|
exports.isNotificationsTabVisible = isNotificationsTabVisible;
|
|
@@ -3,8 +3,9 @@ import { ZeniAPIStatus } from '../../responsePayload';
|
|
|
3
3
|
import { NotificationSettingsPayload } from './settingsViewPayload';
|
|
4
4
|
import { ID } from '../../commonStateTypes/common';
|
|
5
5
|
export declare const initialState: SettingsViewState;
|
|
6
|
-
export declare const fetchMyProfileView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[companyId: string], {
|
|
6
|
+
export declare const fetchMyProfileView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[companyId: string, shouldFetchClassList: boolean], {
|
|
7
7
|
companyId: string;
|
|
8
|
+
shouldFetchClassList: boolean;
|
|
8
9
|
}, string, never, never>, fetchMyProfile: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, fetchNotificationSettingsView: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[hasMonthEndAccess: boolean, companyId: string], {
|
|
9
10
|
hasMonthEndAccess: boolean;
|
|
10
11
|
companyId: string;
|
|
@@ -63,8 +63,8 @@ const settings = (0, toolkit_1.createSlice)({
|
|
|
63
63
|
// Do nothing.
|
|
64
64
|
},
|
|
65
65
|
// eslint-disable-next-line @typescript-eslint/no-inferrable-types
|
|
66
|
-
prepare(companyId) {
|
|
67
|
-
return { payload: { companyId } };
|
|
66
|
+
prepare(companyId, shouldFetchClassList) {
|
|
67
|
+
return { payload: { companyId, shouldFetchClassList } };
|
|
68
68
|
},
|
|
69
69
|
},
|
|
70
70
|
fetchMyProfile(draft) {
|
|
@@ -6,6 +6,6 @@ export declare function getApprovalRuleViewDetails(state: RootState): FetchState
|
|
|
6
6
|
export declare function getBankConnectionsSetupViewDetails(state: RootState, companyId: ID): BankConnectionsSetupView;
|
|
7
7
|
export declare function getMyBankConnectionsDetails(state: RootState, userId: ID): MyBankConnectionsView;
|
|
8
8
|
export declare function getIntegrationsView(state: RootState, companyId: ID): IntegrationsView;
|
|
9
|
-
export declare const getMyProfileView: (state: RootState) => MyProfileSelectorView;
|
|
9
|
+
export declare const getMyProfileView: (state: RootState, shouldFetchClasses: boolean) => MyProfileSelectorView;
|
|
10
10
|
export declare const getNotificationSettings: (state: RootState) => NotificationSettings;
|
|
11
11
|
export declare const getNotificationSettingsView: (state: RootState) => NotificationSettingsSelectorView;
|
|
@@ -63,7 +63,7 @@ function getIntegrationsView(state, companyId) {
|
|
|
63
63
|
};
|
|
64
64
|
}
|
|
65
65
|
exports.getIntegrationsView = getIntegrationsView;
|
|
66
|
-
exports.getMyProfileView = (0, toolkit_1.createSelector)((state) => state.tenantState, (state) => state.userState, (state) => state.userRoleState, (state) => state.settingsViewState, (state) => state.classState, (state) => state.classListState, (state) => (0, companyPassportViewSelector_1.getCompanyPassportView)(state), (state) => (0, userListViewSelector_1.getUserList)(state, 'manager'), (tenantState, userState, userRoleState, settingsViewState, classState, classListState, companyPassportView, managersListView) => {
|
|
66
|
+
exports.getMyProfileView = (0, toolkit_1.createSelector)((state) => state.tenantState, (state) => state.userState, (state) => state.userRoleState, (state) => state.settingsViewState, (state) => state.classState, (state) => state.classListState, (state) => (0, companyPassportViewSelector_1.getCompanyPassportView)(state), (state) => (0, userListViewSelector_1.getUserList)(state, 'manager'), (_state, shouldFetchClasses) => shouldFetchClasses, (tenantState, userState, userRoleState, settingsViewState, classState, classListState, companyPassportView, managersListView, shouldFetchClasses) => {
|
|
67
67
|
var _a, _b, _c, _d;
|
|
68
68
|
const userId = (_a = tenantState.loggedInUser) === null || _a === void 0 ? void 0 : _a.userId;
|
|
69
69
|
if (userId == null) {
|
|
@@ -88,11 +88,13 @@ exports.getMyProfileView = (0, toolkit_1.createSelector)((state) => state.tenant
|
|
|
88
88
|
reportId: 'class_list',
|
|
89
89
|
})
|
|
90
90
|
: undefined;
|
|
91
|
-
const fetchState =
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
91
|
+
const fetchState = shouldFetchClasses
|
|
92
|
+
? (0, reduceFetchState_1.reduceAnyFetchState)([
|
|
93
|
+
settingsViewState.profile,
|
|
94
|
+
companyPassportView,
|
|
95
|
+
classListState,
|
|
96
|
+
])
|
|
97
|
+
: (0, reduceFetchState_1.reduceAnyFetchState)([settingsViewState.profile, companyPassportView]);
|
|
96
98
|
const controllersList = ((_d = companyPassportView.companyView) === null || _d === void 0 ? void 0 : _d.controllers) != null
|
|
97
99
|
? companyPassportView.companyView.controllers.map((controller) => controller.user)
|
|
98
100
|
: [];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zeniai/client-epic-state",
|
|
3
|
-
"version": "4.10.
|
|
3
|
+
"version": "4.10.13",
|
|
4
4
|
"description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|