@zeniai/client-epic-state 5.2.11-betaRD1 → 5.2.12
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/invoicing/invoicingCommonPayload.d.ts +27 -29
- package/lib/entity/invoicing/invoicingCommonPayload.js +37 -75
- package/lib/entity/invoicing/product/productPayload.d.ts +10 -0
- package/lib/entity/invoicing/product/productPayload.js +14 -2
- package/lib/entity/jeSchedules/jeScheduleHelper.d.ts +0 -1
- package/lib/entity/jeSchedules/jeScheduleHelper.js +0 -7
- package/lib/entity/jeSchedules/jeSchedulesPayload.d.ts +1 -66
- package/lib/entity/jeSchedules/jeSchedulesPayload.js +0 -135
- package/lib/entity/jeSchedules/jeSchedulesReducer.d.ts +2 -4
- package/lib/entity/jeSchedules/jeSchedulesReducer.js +2 -30
- package/lib/entity/jeSchedules/jeSchedulesSelector.d.ts +2 -11
- package/lib/entity/jeSchedules/jeSchedulesSelector.js +3 -38
- package/lib/entity/jeSchedules/jeSchedulesState.d.ts +1 -79
- package/lib/entity/jeSchedules/jeSchedulesTypes.d.ts +1 -24
- package/lib/entity/jeSchedules/jeSchedulesTypes.js +1 -88
- package/lib/entity/snackbar/snackbarTypes.d.ts +1 -1
- package/lib/entity/snackbar/snackbarTypes.js +0 -3
- package/lib/entity/transaction/payloadTypes/scheduleTransactionPayload.d.ts +0 -2
- package/lib/entity/transaction/payloadTypes/scheduleTransactionPayload.js +0 -2
- package/lib/entity/transaction/stateTypes/scheduleTransaction.d.ts +0 -2
- package/lib/epic.d.ts +2 -10
- package/lib/epic.js +10 -21
- package/lib/esm/entity/invoicing/invoicingCommonPayload.js +33 -73
- package/lib/esm/entity/invoicing/product/productPayload.js +14 -2
- package/lib/esm/entity/jeSchedules/jeScheduleHelper.js +0 -6
- package/lib/esm/entity/jeSchedules/jeSchedulesPayload.js +1 -135
- package/lib/esm/entity/jeSchedules/jeSchedulesReducer.js +2 -30
- package/lib/esm/entity/jeSchedules/jeSchedulesSelector.js +2 -36
- package/lib/esm/entity/jeSchedules/jeSchedulesTypes.js +0 -78
- package/lib/esm/entity/snackbar/snackbarTypes.js +0 -3
- package/lib/esm/entity/transaction/payloadTypes/scheduleTransactionPayload.js +0 -2
- package/lib/esm/epic.js +6 -17
- package/lib/esm/index.js +13 -18
- package/lib/esm/view/expenseAutomationView/epics/common/fetchAllExpenseAutomationTabsEpic.js +3 -6
- package/lib/esm/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulesEpic.js +5 -41
- package/lib/esm/view/expenseAutomationView/epics/jeSchedule/ignoreRecommendedJeScheduleEpic.js +2 -14
- package/lib/esm/view/expenseAutomationView/payload/jeSchedulesPayload.js +0 -55
- package/lib/esm/view/expenseAutomationView/reducers/jeSchedulesViewReducer.js +29 -306
- package/lib/esm/view/expenseAutomationView/selectors/jeSchedulesViewSelector.js +22 -294
- package/lib/esm/view/expenseAutomationView/types/jeSchedulesViewState.js +6 -5
- package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewPayload.js +25 -9
- package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/saveInvoicingCatalogItemEpic.js +6 -1
- package/lib/esm/view/invoicing/invoicingQboView/invoicingQboViewSelector.js +40 -0
- package/lib/esm/view/invoicing/settingsView/epics/connectInvoicingStripeEpic.js +27 -0
- package/lib/esm/view/invoicing/settingsView/epics/disconnectInvoicingStripeEpic.js +19 -0
- package/lib/esm/view/invoicing/settingsView/epics/fetchInvoicingSettingsEpic.js +19 -0
- package/lib/esm/view/invoicing/settingsView/epics/saveInvoicingSettingsEpic.js +39 -0
- package/lib/esm/view/invoicing/settingsView/epics/submitInvoicingQboSettingsEpic.js +25 -0
- package/lib/esm/view/invoicing/settingsView/invoicingQboSettingsFormConfig.js +48 -0
- package/lib/esm/view/invoicing/settingsView/settingsViewReducer.js +25 -1
- package/lib/esm/view/invoicing/settingsView/settingsViewSelector.js +41 -0
- package/lib/esm/view/scheduleView/scheduleListView/epics/fetchAccruedScheduleListEpic.js +1 -1
- package/lib/esm/view/scheduleView/scheduleListView/epics/fetchDownloadSchedulesEpic.js +2 -7
- package/lib/esm/view/scheduleView/scheduleListView/scheduleListReducer.js +3 -5
- package/lib/index.d.ts +19 -22
- package/lib/index.js +59 -96
- package/lib/view/expenseAutomationView/epics/common/fetchAllExpenseAutomationTabsEpic.js +3 -6
- package/lib/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulesEpic.d.ts +2 -3
- package/lib/view/expenseAutomationView/epics/jeSchedule/fetchJeSchedulesEpic.js +3 -39
- package/lib/view/expenseAutomationView/epics/jeSchedule/ignoreRecommendedJeScheduleEpic.js +2 -14
- package/lib/view/expenseAutomationView/helpers/transactionCategorizationLocalDataHelper.d.ts +1 -1
- package/lib/view/expenseAutomationView/payload/jeSchedulesPayload.d.ts +3 -72
- package/lib/view/expenseAutomationView/payload/jeSchedulesPayload.js +1 -58
- package/lib/view/expenseAutomationView/reducers/jeSchedulesViewReducer.d.ts +12 -91
- package/lib/view/expenseAutomationView/reducers/jeSchedulesViewReducer.js +29 -308
- package/lib/view/expenseAutomationView/reducers/missingReceiptsViewReducer.d.ts +1 -1
- package/lib/view/expenseAutomationView/reducers/transactionsViewReducer.d.ts +2 -2
- package/lib/view/expenseAutomationView/selectorTypes/jeSchedulesSelectorTypes.d.ts +7 -36
- package/lib/view/expenseAutomationView/selectors/jeSchedulesViewSelector.d.ts +0 -34
- package/lib/view/expenseAutomationView/selectors/jeSchedulesViewSelector.js +21 -302
- package/lib/view/expenseAutomationView/types/completedSubTab.d.ts +1 -1
- package/lib/view/expenseAutomationView/types/jeSchedulesViewState.d.ts +8 -82
- package/lib/view/expenseAutomationView/types/jeSchedulesViewState.js +8 -8
- package/lib/view/expenseAutomationView/types/reconciliationViewState.d.ts +2 -2
- package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewPayload.d.ts +12 -1
- package/lib/view/invoicing/editInvoicingCatalogItemDetailView/editInvoicingCatalogItemDetailViewPayload.js +25 -9
- package/lib/view/invoicing/editInvoicingCatalogItemDetailView/saveInvoicingCatalogItemEpic.js +6 -1
- package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.d.ts +10 -1
- package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.js +43 -1
- package/lib/view/invoicing/settingsView/epics/connectInvoicingStripeEpic.d.ts +6 -0
- package/lib/view/invoicing/settingsView/epics/connectInvoicingStripeEpic.js +31 -0
- package/lib/view/invoicing/settingsView/epics/disconnectInvoicingStripeEpic.d.ts +6 -0
- package/lib/view/invoicing/settingsView/epics/disconnectInvoicingStripeEpic.js +23 -0
- package/lib/view/invoicing/settingsView/epics/fetchInvoicingSettingsEpic.d.ts +6 -0
- package/lib/view/invoicing/settingsView/epics/fetchInvoicingSettingsEpic.js +23 -0
- package/lib/view/invoicing/settingsView/epics/saveInvoicingSettingsEpic.d.ts +6 -0
- package/lib/view/invoicing/settingsView/epics/saveInvoicingSettingsEpic.js +43 -0
- package/lib/view/invoicing/settingsView/epics/settingsViewActionType.d.ts +5 -0
- package/lib/view/invoicing/settingsView/epics/submitInvoicingQboSettingsEpic.d.ts +11 -0
- package/lib/view/invoicing/settingsView/epics/submitInvoicingQboSettingsEpic.js +29 -0
- package/lib/view/invoicing/settingsView/invoicingQboSettingsFormConfig.d.ts +34 -0
- package/lib/view/invoicing/settingsView/invoicingQboSettingsFormConfig.js +53 -0
- package/lib/view/invoicing/settingsView/settingsViewReducer.d.ts +4 -1
- package/lib/view/invoicing/settingsView/settingsViewReducer.js +26 -2
- package/lib/view/invoicing/settingsView/settingsViewSelector.d.ts +35 -0
- package/lib/view/invoicing/settingsView/settingsViewSelector.js +43 -1
- package/lib/view/invoicing/settingsView/settingsViewState.d.ts +8 -0
- package/lib/view/scheduleView/scheduleListView/epics/fetchAccruedScheduleListEpic.js +1 -1
- package/lib/view/scheduleView/scheduleListView/epics/fetchDownloadSchedulesEpic.js +2 -7
- package/lib/view/scheduleView/scheduleListView/scheduleListReducer.d.ts +2 -4
- package/lib/view/scheduleView/scheduleListView/scheduleListReducer.js +3 -5
- package/package.json +1 -1
- package/lib/commonStateTypes/selectorTypes/pickAndMergeForecastSection.d.ts +0 -0
- package/lib/commonStateTypes/selectorTypes/pickAndMergeForecastSection.js +0 -1
- package/lib/entity/invoicing/coupon/couponConstants.d.ts +0 -11
- package/lib/entity/invoicing/coupon/couponConstants.js +0 -29
- package/lib/esm/commonStateTypes/selectorTypes/pickAndMergeForecastSection.js +0 -1
- package/lib/esm/entity/invoicing/coupon/couponConstants.js +0 -26
- package/lib/esm/view/expenseAutomationView/epics/jeSchedule/fetchOneTimeAccrualEpic.js +0 -45
- package/lib/esm/view/expenseAutomationView/epics/jeSchedule/newSchedule/createOneTimeAccrualEpic.js +0 -99
- package/lib/esm/view/expenseAutomationView/epics/jeSchedule/newSchedule/initializeNewScheduleEpic.js +0 -25
- package/lib/esm/view/expenseAutomationView/epics/jeSchedule/newSchedule/saveNewScheduleEpic.js +0 -110
- package/lib/esm/view/expenseAutomationView/epics/jeSchedule/newSchedule/searchTransactionsForNewScheduleEpic.js +0 -79
- package/lib/esm/view/expenseAutomationView/epics/jeSchedule/oneTimeAccrualActionsEpic.js +0 -139
- package/lib/esm/view/expenseAutomationView/epics/jeSchedule/revertJeScheduleEpic.js +0 -106
- package/lib/esm/view/expenseAutomationView/epics/jeSchedule/switchJESchedulesTabEpic.js +0 -22
- package/lib/esm/view/expenseAutomationView/helpers/newScheduleLocalDataHelper.js +0 -140
- package/lib/esm/view/expenseAutomationView/selectors/jeNewScheduleViewSelector.js +0 -106
- package/lib/esm/view/invoicing/invoicingQboView/epics/fetchInvoicingQboAccountsEpic.js +0 -25
- package/lib/esm/view/invoicing/invoicingQboView/epics/fetchInvoicingQboClassesEpic.js +0 -15
- package/lib/esm/view/invoicing/settingsView/settingsViewEpics.js +0 -92
- package/lib/esm/view/spendManagement/treasury/treasurySetUp/epic/updateTreasuryPromoIntroClosedByOutsideClickEpic.js +0 -18
- package/lib/esm/view/spendManagement/treasury/treasurySetUp/epic/updateTreasuryPromoRemindMeLaterClickedEpic.js +0 -18
- package/lib/esm/view/spendManagement/treasury/treasurySetUp/epic/updateTreasuryVideoViewedEpic.js +0 -18
- package/lib/esm/view/zeniAccountsPromoCard/zeniAccountsPromoCardEpic.js +0 -16
- package/lib/esm/view/zeniAccountsPromoCard/zeniAccountsPromoCardPayload.js +0 -1
- package/lib/esm/view/zeniAccountsPromoCard/zeniAccountsPromoCardReducer.js +0 -60
- package/lib/esm/view/zeniAccountsPromoCard/zeniAccountsPromoCardSelector.js +0 -12
- package/lib/esm/view/zeniAccountsPromoCard/zeniAccountsPromoCardState.js +0 -1
- package/lib/view/expenseAutomationView/epics/jeSchedule/fetchOneTimeAccrualEpic.d.ts +0 -20
- package/lib/view/expenseAutomationView/epics/jeSchedule/fetchOneTimeAccrualEpic.js +0 -49
- package/lib/view/expenseAutomationView/epics/jeSchedule/newSchedule/createOneTimeAccrualEpic.d.ts +0 -8
- package/lib/view/expenseAutomationView/epics/jeSchedule/newSchedule/createOneTimeAccrualEpic.js +0 -103
- package/lib/view/expenseAutomationView/epics/jeSchedule/newSchedule/initializeNewScheduleEpic.d.ts +0 -8
- package/lib/view/expenseAutomationView/epics/jeSchedule/newSchedule/initializeNewScheduleEpic.js +0 -29
- package/lib/view/expenseAutomationView/epics/jeSchedule/newSchedule/saveNewScheduleEpic.d.ts +0 -45
- package/lib/view/expenseAutomationView/epics/jeSchedule/newSchedule/saveNewScheduleEpic.js +0 -114
- package/lib/view/expenseAutomationView/epics/jeSchedule/newSchedule/searchTransactionsForNewScheduleEpic.d.ts +0 -8
- package/lib/view/expenseAutomationView/epics/jeSchedule/newSchedule/searchTransactionsForNewScheduleEpic.js +0 -83
- package/lib/view/expenseAutomationView/epics/jeSchedule/oneTimeAccrualActionsEpic.d.ts +0 -12
- package/lib/view/expenseAutomationView/epics/jeSchedule/oneTimeAccrualActionsEpic.js +0 -146
- package/lib/view/expenseAutomationView/epics/jeSchedule/revertJeScheduleEpic.d.ts +0 -64
- package/lib/view/expenseAutomationView/epics/jeSchedule/revertJeScheduleEpic.js +0 -110
- package/lib/view/expenseAutomationView/epics/jeSchedule/switchJESchedulesTabEpic.d.ts +0 -6
- package/lib/view/expenseAutomationView/epics/jeSchedule/switchJESchedulesTabEpic.js +0 -26
- package/lib/view/expenseAutomationView/helpers/newScheduleLocalDataHelper.d.ts +0 -36
- package/lib/view/expenseAutomationView/helpers/newScheduleLocalDataHelper.js +0 -145
- package/lib/view/expenseAutomationView/selectorTypes/jeNewScheduleViewSelectorTypes.d.ts +0 -42
- package/lib/view/expenseAutomationView/selectors/jeNewScheduleViewSelector.d.ts +0 -21
- package/lib/view/expenseAutomationView/selectors/jeNewScheduleViewSelector.js +0 -112
- package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingQboAccountsEpic.d.ts +0 -6
- package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingQboAccountsEpic.js +0 -29
- package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingQboClassesEpic.d.ts +0 -6
- package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingQboClassesEpic.js +0 -19
- package/lib/view/invoicing/settingsView/settingsViewEpics.d.ts +0 -12
- package/lib/view/invoicing/settingsView/settingsViewEpics.js +0 -99
- package/lib/view/spendManagement/treasury/treasurySetUp/epic/updateTreasuryPromoIntroClosedByOutsideClickEpic.d.ts +0 -8
- package/lib/view/spendManagement/treasury/treasurySetUp/epic/updateTreasuryPromoIntroClosedByOutsideClickEpic.js +0 -22
- package/lib/view/spendManagement/treasury/treasurySetUp/epic/updateTreasuryPromoRemindMeLaterClickedEpic.d.ts +0 -8
- package/lib/view/spendManagement/treasury/treasurySetUp/epic/updateTreasuryPromoRemindMeLaterClickedEpic.js +0 -22
- package/lib/view/spendManagement/treasury/treasurySetUp/epic/updateTreasuryVideoViewedEpic.d.ts +0 -8
- package/lib/view/spendManagement/treasury/treasurySetUp/epic/updateTreasuryVideoViewedEpic.js +0 -22
- package/lib/view/zeniAccountsPromoCard/zeniAccountsPromoCardEpic.d.ts +0 -13
- package/lib/view/zeniAccountsPromoCard/zeniAccountsPromoCardEpic.js +0 -20
- package/lib/view/zeniAccountsPromoCard/zeniAccountsPromoCardPayload.d.ts +0 -11
- package/lib/view/zeniAccountsPromoCard/zeniAccountsPromoCardPayload.js +0 -2
- package/lib/view/zeniAccountsPromoCard/zeniAccountsPromoCardReducer.d.ts +0 -7
- package/lib/view/zeniAccountsPromoCard/zeniAccountsPromoCardReducer.js +0 -64
- package/lib/view/zeniAccountsPromoCard/zeniAccountsPromoCardSelector.d.ts +0 -12
- package/lib/view/zeniAccountsPromoCard/zeniAccountsPromoCardSelector.js +0 -15
- package/lib/view/zeniAccountsPromoCard/zeniAccountsPromoCardState.d.ts +0 -9
- package/lib/view/zeniAccountsPromoCard/zeniAccountsPromoCardState.js +0 -2
- /package/lib/esm/view/{expenseAutomationView/selectorTypes/jeNewScheduleViewSelectorTypes.js → invoicing/settingsView/epics/settingsViewActionType.js} +0 -0
- /package/lib/view/{expenseAutomationView/selectorTypes/jeNewScheduleViewSelectorTypes.js → invoicing/settingsView/epics/settingsViewActionType.js} +0 -0
|
@@ -3,9 +3,7 @@ import orderBy from 'lodash/orderBy';
|
|
|
3
3
|
import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
|
|
4
4
|
import { LAST_SCHEDULE_DAY_OF_MONTH, toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
|
|
5
5
|
import { getAccountIdsForTypes } from '../../../entity/account/accountSelector';
|
|
6
|
-
import {
|
|
7
|
-
import { getJEAccruedScheduleByJEScheduleKey, getJEOneTimeAccrualByKey, getJEScheduledTransactionByJEScheduleTransactionKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
|
|
8
|
-
import { ALL_SCHEDULES_TYPES, } from '../../../entity/jeSchedules/jeSchedulesTypes';
|
|
6
|
+
import { getJEScheduledTransactionByJEScheduleTransactionKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
|
|
9
7
|
import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
|
|
10
8
|
import { getAccountIdsForLabel, getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts, } from '../../accountList/accountListSelector';
|
|
11
9
|
import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
|
|
@@ -13,126 +11,8 @@ import { getAccountsTypesForScheduleDetails } from '../../scheduleView/scheduleD
|
|
|
13
11
|
import { filterNestedAccountHierarchyById } from '../../scheduleView/scheduleDetailView/scheduleDetailSelector';
|
|
14
12
|
import { getAccountLabelForScheduleType, getAccountsTypesForScheduleList, } from '../../scheduleView/scheduleListView/scheduleListHelper';
|
|
15
13
|
import { getAllSteps } from './getAllStepsHelper';
|
|
16
|
-
import { ALL_JE_PAGE_TABS, getJESchedulePeriodTabKey, } from '../types/jeSchedulesViewState';
|
|
17
14
|
import { getJEAccountSettingsView } from './jeAccountSettingsViewSelector';
|
|
18
|
-
import { getNewScheduleView } from './jeNewScheduleViewSelector';
|
|
19
|
-
// Matches the AI-automation user addresses webc's schedule list row already
|
|
20
|
-
// checks (JEScheduleReadOnlyListRow/JEScheduleDraftListRow "Method" column,
|
|
21
|
-
// strings.ts aiBotEmail/botEmail) to determine whether a schedule was
|
|
22
|
-
// created by the AI accountant vs. a human.
|
|
23
|
-
const AI_BOT_EMAIL = 'ai@zeni.ai';
|
|
24
|
-
const BOT_EMAIL = 'bot@zeni.ai';
|
|
25
|
-
// A one-time accrual has no jeScheduleType of its own — it is not a JE schedule. It is still an
|
|
26
|
-
// accrued expense, so it counts and filters under that type on the page's type tabs.
|
|
27
|
-
const ONE_TIME_ACCRUAL_SCHEDULE_TYPE = 'accrued_expenses';
|
|
28
|
-
// Which of the two list buckets an accrual belongs in. `draft` still needs a human to post it;
|
|
29
|
-
// everything else is already on the books or in a transient claim.
|
|
30
|
-
const ONE_TIME_ACCRUAL_REVIEW_STATUSES = [
|
|
31
|
-
'draft',
|
|
32
|
-
];
|
|
33
|
-
/**
|
|
34
|
-
* `posting_blocked` is written by the posting Cron when a JE fails to post. It is an internal
|
|
35
|
-
* failure state with no human action attached, so it is dropped here rather than hidden at render
|
|
36
|
-
* time — filtering in the view would leave the group counts and KPI totals counting rows nobody
|
|
37
|
-
* can see. The expense-automation endpoint applies no status filter on the close-period path, so
|
|
38
|
-
* these rows do arrive.
|
|
39
|
-
*/
|
|
40
|
-
export function isRenderableOneTimeAccrual(accrual) {
|
|
41
|
-
return accrual.accrualStatus !== 'posting_blocked';
|
|
42
|
-
}
|
|
43
|
-
export function getJEScheduleRowType(schedule) {
|
|
44
|
-
return isOneTimeAccrualRow(schedule)
|
|
45
|
-
? ONE_TIME_ACCRUAL_SCHEDULE_TYPE
|
|
46
|
-
: schedule.jeScheduleType;
|
|
47
|
-
}
|
|
48
|
-
export function isPendingReviewRow(schedule) {
|
|
49
|
-
return isOneTimeAccrualRow(schedule)
|
|
50
|
-
? ONE_TIME_ACCRUAL_REVIEW_STATUSES.includes(schedule.accrualStatus)
|
|
51
|
-
: schedule.status.code === 'draft';
|
|
52
|
-
}
|
|
53
|
-
// Belongs on the Existing Schedules tab. For an accrual the endpoint has already filtered to
|
|
54
|
-
// posted, so this only has to agree with that rather than re-derive it.
|
|
55
|
-
export function isExistingTabRow(schedule) {
|
|
56
|
-
return isOneTimeAccrualRow(schedule)
|
|
57
|
-
? schedule.accrualStatus === 'posted'
|
|
58
|
-
: schedule.status.code === 'ongoing';
|
|
59
|
-
}
|
|
60
|
-
// Exported (rather than kept as a closure inside the selector) so it can be
|
|
61
|
-
// unit-tested directly — confidenceScore is a separate, more narrowly
|
|
62
|
-
// populated field that can be null on a schedule the bot user created,
|
|
63
|
-
// which previously caused these schedules to display as "AI Accountant" in
|
|
64
|
-
// the list but count under "Manual" in the KPI summary.
|
|
65
|
-
export const isAiAccountantSchedule = (schedule) => {
|
|
66
|
-
// A one-time accrual records who made it as `origin`, which is authoritative — no email
|
|
67
|
-
// sniffing needed, and the JE bot is often absent from the user entity entirely.
|
|
68
|
-
if (isOneTimeAccrualRow(schedule)) {
|
|
69
|
-
return schedule.origin === 'agent';
|
|
70
|
-
}
|
|
71
|
-
return (schedule.createdByUser?.email === AI_BOT_EMAIL ||
|
|
72
|
-
schedule.createdByUser?.email === BOT_EMAIL);
|
|
73
|
-
};
|
|
74
|
-
// Accrued schedules are structurally distinct — no baseTransaction, carrying recurringAmount and
|
|
75
|
-
// memo in its place — so anything reading baseTransaction has to branch on this first.
|
|
76
|
-
//
|
|
77
|
-
// Discriminates on jeAccruedScheduleKey, which only JEAccruedSchedule carries. jeScheduleType
|
|
78
|
-
// cannot be used: it is a data field present on BOTH row shapes, so an accrued-typed row that
|
|
79
|
-
// arrived through the prepaid/fixed DTO (failed_je_postings, legacy fetches) would be
|
|
80
|
-
// misclassified and then crash on recurringAmount / jeAccruedScheduleKey.
|
|
81
|
-
export function isAccruedScheduleRow(schedule) {
|
|
82
|
-
return 'jeAccruedScheduleKey' in schedule;
|
|
83
|
-
}
|
|
84
|
-
// Same structural approach as isAccruedScheduleRow, and for the same reason: jeOneTimeAccrualKey
|
|
85
|
-
// exists only on this shape. Note the two guards are NOT interchangeable — a one-time accrual is
|
|
86
|
-
// not an accrued *schedule*, and routing it into the accrued branch would read recurringAmount,
|
|
87
|
-
// render postedCount/lifecycleTotal as a lifecycle and startDate–endDate as a period, none of
|
|
88
|
-
// which it has.
|
|
89
|
-
export function isOneTimeAccrualRow(schedule) {
|
|
90
|
-
return 'jeOneTimeAccrualKey' in schedule;
|
|
91
|
-
}
|
|
92
|
-
function getScheduleAmount(schedule) {
|
|
93
|
-
if (isOneTimeAccrualRow(schedule)) {
|
|
94
|
-
return schedule.estimatedAmount.amount;
|
|
95
|
-
}
|
|
96
|
-
if (isAccruedScheduleRow(schedule)) {
|
|
97
|
-
return schedule.recurringAmount.amount;
|
|
98
|
-
}
|
|
99
|
-
return schedule.baseTransaction.amount.amount;
|
|
100
|
-
}
|
|
101
|
-
// A one-time accrual shares almost no sortable field with a schedule, so it gets its own accessor
|
|
102
|
-
// rather than a guard on each of the dozen cases below. Keys with no meaning for a single-month
|
|
103
|
-
// accrual -- amortizationPeriod, remainingMonths, runningBalance, jePostingDate, scheduleCategory --
|
|
104
|
-
// deliberately fall through to undefined, which sorts them together at one end.
|
|
105
|
-
function getOneTimeAccrualSortValue(accrual, sortKey) {
|
|
106
|
-
switch (sortKey) {
|
|
107
|
-
case 'vendor':
|
|
108
|
-
return accrual.vendorName.toLowerCase();
|
|
109
|
-
case 'category':
|
|
110
|
-
return accrual.jeDebitAccountName?.toLowerCase();
|
|
111
|
-
case 'class':
|
|
112
|
-
return accrual.jeDebitAccountingClassName?.toLowerCase();
|
|
113
|
-
case 'depCategory':
|
|
114
|
-
return accrual.jeCreditAccountName?.toLowerCase();
|
|
115
|
-
case 'type':
|
|
116
|
-
return ONE_TIME_ACCRUAL_SCHEDULE_TYPE;
|
|
117
|
-
case 'totalAmount':
|
|
118
|
-
return accrual.estimatedAmount.amount;
|
|
119
|
-
case 'transactionDate':
|
|
120
|
-
return accrual.postingDate?.valueOf();
|
|
121
|
-
case 'memo':
|
|
122
|
-
return accrual.memo.toLowerCase();
|
|
123
|
-
case 'startMonth':
|
|
124
|
-
return accrual.serviceMonth;
|
|
125
|
-
default:
|
|
126
|
-
return undefined;
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
15
|
function getJEScheduleSortAccessor(sortKey) {
|
|
130
|
-
const scheduleAccessor = getScheduleRowSortAccessor(sortKey);
|
|
131
|
-
return (schedule) => isOneTimeAccrualRow(schedule)
|
|
132
|
-
? getOneTimeAccrualSortValue(schedule, sortKey)
|
|
133
|
-
: scheduleAccessor(schedule);
|
|
134
|
-
}
|
|
135
|
-
function getScheduleRowSortAccessor(sortKey) {
|
|
136
16
|
switch (sortKey) {
|
|
137
17
|
case 'vendor':
|
|
138
18
|
return (s) => s.vendor.name?.toLowerCase();
|
|
@@ -143,9 +23,7 @@ function getScheduleRowSortAccessor(sortKey) {
|
|
|
143
23
|
case 'depCategory':
|
|
144
24
|
return (s) => s.jeCredit.account?.accountName?.toLowerCase();
|
|
145
25
|
case 'scheduleCategory':
|
|
146
|
-
return (s) =>
|
|
147
|
-
? undefined
|
|
148
|
-
: s.baseTransaction.account?.accountName?.toLowerCase();
|
|
26
|
+
return (s) => s.baseTransaction.account?.accountName?.toLowerCase();
|
|
149
27
|
case 'startMonth':
|
|
150
28
|
return (s) => s.startDate?.valueOf();
|
|
151
29
|
case 'type':
|
|
@@ -173,13 +51,11 @@ function getScheduleRowSortAccessor(sortKey) {
|
|
|
173
51
|
return s.balanceAsOfToday?.amount ?? null;
|
|
174
52
|
};
|
|
175
53
|
case 'totalAmount':
|
|
176
|
-
return (s) =>
|
|
54
|
+
return (s) => s.baseTransaction.amount.amount;
|
|
177
55
|
case 'transactionDate':
|
|
178
|
-
return (s) => s.
|
|
56
|
+
return (s) => s.baseTransaction.date.valueOf();
|
|
179
57
|
case 'memo':
|
|
180
|
-
return (s) =>
|
|
181
|
-
? s.memo.toLowerCase()
|
|
182
|
-
: s.baseTransaction.memo?.toLowerCase();
|
|
58
|
+
return (s) => s.baseTransaction.memo?.toLowerCase();
|
|
183
59
|
default:
|
|
184
60
|
return (s) => s.startDate?.valueOf();
|
|
185
61
|
}
|
|
@@ -191,15 +67,9 @@ function sortJEScheduledTransactions(transactions, sortKey, sortOrder) {
|
|
|
191
67
|
export function getExpenseAutomationJESchedulesView(state) {
|
|
192
68
|
const jeScheduledTransaction = [];
|
|
193
69
|
const failedJeScheduledTransaction = [];
|
|
194
|
-
const accruedSchedules = [];
|
|
195
|
-
const oneTimeAccruals = [];
|
|
196
70
|
const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
|
|
197
|
-
const {
|
|
71
|
+
const { jeScheduleTransactionKeysByPeriod, failedJeScheduleTransactionKeysByPeriod, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, } = expenseAutomationJESchedulesViewState;
|
|
198
72
|
const accountSettingsView = getJEAccountSettingsView(state);
|
|
199
|
-
const newScheduleView = newSchedule.selectedDetailScheduleType === 'fixed_assets' ||
|
|
200
|
-
newSchedule.selectedDetailScheduleType === 'prepaid_expenses'
|
|
201
|
-
? getNewScheduleView(state, newSchedule.selectedDetailScheduleType)
|
|
202
|
-
: undefined;
|
|
203
73
|
const currentTenant = getCurrentTenant(state);
|
|
204
74
|
const { selectedPeriodByTenantId } = expenseAutomationViewState;
|
|
205
75
|
const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
|
|
@@ -227,48 +97,27 @@ export function getExpenseAutomationJESchedulesView(state) {
|
|
|
227
97
|
const filteredDepAccountListNestedAccountHierarchy = filterNestedAccountHierarchyById(depAccountListNestedAccountHierarchy, filteredDepAccounts.map((account) => account.accountId));
|
|
228
98
|
const classListNestedAccountHierarchy = getNestedClassListHierarchy(classListState);
|
|
229
99
|
const monthYearPeriodId = selectedPeriod != null ? toMonthYearPeriodId(selectedPeriod) : null;
|
|
230
|
-
const
|
|
231
|
-
?
|
|
100
|
+
const jeScheduleTransactionKeysForSelectedPeriod = monthYearPeriodId != null
|
|
101
|
+
? jeScheduleTransactionKeysByPeriod[monthYearPeriodId]
|
|
232
102
|
: null;
|
|
233
|
-
const
|
|
234
|
-
?
|
|
235
|
-
:
|
|
236
|
-
const
|
|
237
|
-
|
|
238
|
-
: undefined;
|
|
239
|
-
// Distinguishes "this tab has never been fetched for this period" from "fetched and genuinely
|
|
240
|
-
// empty". Without it the page cannot tell a first visit from a real empty state, and renders an
|
|
241
|
-
// empty table where it should render a skeleton.
|
|
242
|
-
const hasLoadedForSelectedTab = jeScheduleTransactionKeysForSelectedTab != null;
|
|
243
|
-
const jeScheduleTransactionKeys = jeScheduleTransactionKeysForSelectedTab ?? [];
|
|
244
|
-
const failedJeScheduleTransactionKeys = failedJeScheduleTransactionKeysForSelectedTab ?? [];
|
|
245
|
-
const jeScheduleAccruedKeys = (selectedPeriodTabKey != null
|
|
246
|
-
? jeScheduleAccruedKeysByPeriodAndTab[selectedPeriodTabKey]
|
|
247
|
-
: undefined) ?? [];
|
|
248
|
-
const jeScheduleOneTimeAccrualKeys = (selectedPeriodTabKey != null
|
|
249
|
-
? jeScheduleOneTimeAccrualKeysByPeriodAndTab[selectedPeriodTabKey]
|
|
250
|
-
: undefined) ?? [];
|
|
251
|
-
jeScheduleOneTimeAccrualKeys.forEach((jeOneTimeAccrualKey) => {
|
|
252
|
-
const accrual = getJEOneTimeAccrualByKey(jeOneTimeAccrualKey, state.jeSchedulesState);
|
|
253
|
-
if (accrual != null && isRenderableOneTimeAccrual(accrual)) {
|
|
254
|
-
oneTimeAccruals.push(accrual);
|
|
255
|
-
}
|
|
256
|
-
});
|
|
103
|
+
const failedJeScheduleTransactionKeysForSelectedPeriod = monthYearPeriodId != null
|
|
104
|
+
? failedJeScheduleTransactionKeysByPeriod[monthYearPeriodId]
|
|
105
|
+
: null;
|
|
106
|
+
const jeScheduleTransactionKeys = jeScheduleTransactionKeysForSelectedPeriod ?? [];
|
|
107
|
+
const failedJeScheduleTransactionKeys = failedJeScheduleTransactionKeysForSelectedPeriod ?? [];
|
|
257
108
|
jeScheduleTransactionKeys.forEach((jeScheduleKey) => {
|
|
258
109
|
const jeScheduleDetails = getJEScheduledTransactionByJEScheduleTransactionKey(jeScheduleKey, state);
|
|
259
110
|
jeScheduledTransaction.push(jeScheduleDetails);
|
|
260
111
|
});
|
|
261
|
-
jeScheduleAccruedKeys.forEach((jeAccruedScheduleKey) => {
|
|
262
|
-
const accruedScheduleDetails = getJEAccruedScheduleByJEScheduleKey(jeAccruedScheduleKey, state);
|
|
263
|
-
if (accruedScheduleDetails != null) {
|
|
264
|
-
accruedSchedules.push(accruedScheduleDetails);
|
|
265
|
-
}
|
|
266
|
-
});
|
|
267
112
|
failedJeScheduleTransactionKeys.forEach((jeScheduleKey) => {
|
|
268
113
|
const jeScheduleDetails = getJEScheduledTransactionByJEScheduleTransactionKey(jeScheduleKey, state);
|
|
269
114
|
failedJeScheduledTransaction.push(jeScheduleDetails);
|
|
270
115
|
});
|
|
271
|
-
const { sortKey, sortOrder
|
|
116
|
+
const { sortKey, sortOrder } = uiState;
|
|
117
|
+
const draftSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'), sortKey, sortOrder);
|
|
118
|
+
const ongoingSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'ongoing'), sortKey, sortOrder);
|
|
119
|
+
const completedSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'completed' ||
|
|
120
|
+
schedule.status.code === 'marked_as_completed'), sortKey, sortOrder);
|
|
272
121
|
const unsortedResolveSchedules = [];
|
|
273
122
|
failedJeScheduledTransaction.forEach((schedule) => {
|
|
274
123
|
schedule.scheduledJournalEntry.forEach((journalEntry) => {
|
|
@@ -280,87 +129,10 @@ export function getExpenseAutomationJESchedulesView(state) {
|
|
|
280
129
|
});
|
|
281
130
|
const resolveSchedules = sortJEScheduledTransactions(unsortedResolveSchedules, sortKey, sortOrder);
|
|
282
131
|
const validResolveForPending = unsortedResolveSchedules.filter((r) => jeScheduleLocalDataById[r.scheduledJournalEntry.scheduledJournalEntryID] != null);
|
|
283
|
-
const matchesTypeFilter = (schedule) => selectedJETypeFilter == null ||
|
|
284
|
-
getJEScheduleRowType(schedule) === selectedJETypeFilter;
|
|
285
|
-
const isCreatedStatus = (schedule) => {
|
|
286
|
-
// An accrual is "created" once it is not review work: posted, reversing, reversed, or in a
|
|
287
|
-
// transient posting claim.
|
|
288
|
-
if (isOneTimeAccrualRow(schedule)) {
|
|
289
|
-
return !isPendingReviewRow(schedule);
|
|
290
|
-
}
|
|
291
|
-
return (schedule.status.code === 'ongoing' ||
|
|
292
|
-
schedule.status.code === 'completed' ||
|
|
293
|
-
schedule.status.code === 'marked_as_completed');
|
|
294
|
-
};
|
|
295
|
-
const allScheduleRows = [
|
|
296
|
-
...jeScheduledTransaction,
|
|
297
|
-
...accruedSchedules,
|
|
298
|
-
...oneTimeAccruals,
|
|
299
|
-
];
|
|
300
132
|
const pendingReviewSchedules = sortJEScheduledTransactions([
|
|
301
|
-
...
|
|
133
|
+
...jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'),
|
|
302
134
|
...validResolveForPending,
|
|
303
135
|
], sortKey, sortOrder);
|
|
304
|
-
const createdSchedules = sortJEScheduledTransactions(allScheduleRows.filter((schedule) => isCreatedStatus(schedule) && matchesTypeFilter(schedule)), sortKey, sortOrder);
|
|
305
|
-
// KPI summary — derived from unfiltered schedules so counts are always accurate
|
|
306
|
-
const allSchedules = allScheduleRows;
|
|
307
|
-
const sumAmount = (schedules) => schedules.reduce((total, schedule) => total + (getScheduleAmount(schedule) ?? 0), 0);
|
|
308
|
-
const pendingReviewTotal = sumAmount(pendingReviewSchedules);
|
|
309
|
-
const createdTotal = sumAmount(createdSchedules);
|
|
310
|
-
const aiAccountantSchedules = allSchedules.filter(isAiAccountantSchedule);
|
|
311
|
-
const manualSchedules = allSchedules.filter((schedule) => !isAiAccountantSchedule(schedule));
|
|
312
|
-
const pendingUnfiltered = allSchedules.filter((schedule) => isPendingReviewRow(schedule));
|
|
313
|
-
const kpiSummary = {
|
|
314
|
-
aiAccountant: {
|
|
315
|
-
count: aiAccountantSchedules.length,
|
|
316
|
-
amount: sumAmount(aiAccountantSchedules),
|
|
317
|
-
},
|
|
318
|
-
manual: {
|
|
319
|
-
count: manualSchedules.length,
|
|
320
|
-
amount: sumAmount(manualSchedules),
|
|
321
|
-
},
|
|
322
|
-
needsReview: {
|
|
323
|
-
count: pendingUnfiltered.length,
|
|
324
|
-
amount: sumAmount(pendingUnfiltered),
|
|
325
|
-
},
|
|
326
|
-
total: {
|
|
327
|
-
count: allSchedules.length,
|
|
328
|
-
amount: sumAmount(allSchedules),
|
|
329
|
-
},
|
|
330
|
-
};
|
|
331
|
-
// Each tab's badge counts from that tab's own bucket. A tab that has not been fetched yet
|
|
332
|
-
// reports undefined rather than 0, so the UI can hide the badge instead of asserting "none".
|
|
333
|
-
const scheduleCountsByTab = {};
|
|
334
|
-
ALL_JE_PAGE_TABS.forEach((pageTab) => {
|
|
335
|
-
const periodTabKey = monthYearPeriodId != null
|
|
336
|
-
? getJESchedulePeriodTabKey(pageTab, monthYearPeriodId)
|
|
337
|
-
: null;
|
|
338
|
-
const transactionKeys = periodTabKey != null
|
|
339
|
-
? jeScheduleTransactionKeysByPeriodAndTab[periodTabKey]
|
|
340
|
-
: undefined;
|
|
341
|
-
if (transactionKeys == null) {
|
|
342
|
-
return;
|
|
343
|
-
}
|
|
344
|
-
const accruedKeys = (periodTabKey != null
|
|
345
|
-
? jeScheduleAccruedKeysByPeriodAndTab[periodTabKey]
|
|
346
|
-
: undefined) ?? [];
|
|
347
|
-
const oneTimeAccrualKeys = (periodTabKey != null
|
|
348
|
-
? jeScheduleOneTimeAccrualKeysByPeriodAndTab[periodTabKey]
|
|
349
|
-
: undefined) ?? [];
|
|
350
|
-
const rowsForTab = [
|
|
351
|
-
...transactionKeys.map((transactionKey) => getJEScheduledTransactionByJEScheduleTransactionKey(transactionKey, state)),
|
|
352
|
-
...accruedKeys
|
|
353
|
-
.map((accruedKey) => getJEAccruedScheduleByJEScheduleKey(accruedKey, state))
|
|
354
|
-
.filter((accruedRow) => accruedRow != null),
|
|
355
|
-
...oneTimeAccrualKeys
|
|
356
|
-
.map((accrualKey) => getJEOneTimeAccrualByKey(accrualKey, state.jeSchedulesState))
|
|
357
|
-
.filter((accrualRow) => accrualRow != null && isRenderableOneTimeAccrual(accrualRow)),
|
|
358
|
-
];
|
|
359
|
-
scheduleCountsByTab[pageTab] =
|
|
360
|
-
pageTab === 'existing_schedules'
|
|
361
|
-
? rowsForTab.filter((row) => isExistingTabRow(row)).length
|
|
362
|
-
: rowsForTab.filter((row) => isPendingReviewRow(row) || isCreatedStatus(row)).length;
|
|
363
|
-
});
|
|
364
136
|
const allSteps = monthYearPeriodId != null
|
|
365
137
|
? getAllSteps(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
|
|
366
138
|
: [];
|
|
@@ -373,20 +145,6 @@ export function getExpenseAutomationJESchedulesView(state) {
|
|
|
373
145
|
{ fetchState, error },
|
|
374
146
|
monthEndFetchState,
|
|
375
147
|
]);
|
|
376
|
-
const countByType = (schedules) => {
|
|
377
|
-
const counts = ALL_SCHEDULES_TYPES.reduce((acc, type) => ({ ...acc, [type]: 0 }), {});
|
|
378
|
-
schedules.forEach((schedule) => {
|
|
379
|
-
const scheduleType = getJEScheduleRowType(schedule);
|
|
380
|
-
if (scheduleType != null) {
|
|
381
|
-
counts[scheduleType] += 1;
|
|
382
|
-
}
|
|
383
|
-
});
|
|
384
|
-
return counts;
|
|
385
|
-
};
|
|
386
|
-
const jeScheduleTypeCounts = {
|
|
387
|
-
active: countByType(allSchedules.filter((schedule) => isPendingReviewRow(schedule) || isCreatedStatus(schedule))),
|
|
388
|
-
ongoing: countByType(allSchedules.filter((schedule) => isExistingTabRow(schedule))),
|
|
389
|
-
};
|
|
390
148
|
return {
|
|
391
149
|
uncategorizedAccounts,
|
|
392
150
|
allDepreciationAccountList: filteredDepAccounts,
|
|
@@ -395,21 +153,14 @@ export function getExpenseAutomationJESchedulesView(state) {
|
|
|
395
153
|
allAccountList: filteredAccounts,
|
|
396
154
|
accountListNestedAccountHierarchy,
|
|
397
155
|
allClassList: allClasses,
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
jeScheduleTypeCounts,
|
|
402
|
-
scheduleCountsByTab,
|
|
403
|
-
kpiSummary,
|
|
156
|
+
completedSchedules,
|
|
157
|
+
draftSchedules,
|
|
158
|
+
ongoingSchedules,
|
|
404
159
|
pendingReviewSchedules,
|
|
405
|
-
pendingReviewTotal,
|
|
406
160
|
resolveSchedules: resolveSchedules,
|
|
407
161
|
accountSettingsView,
|
|
408
|
-
newScheduleView,
|
|
409
162
|
postStatusById: postStatusById,
|
|
410
163
|
ignoreStatusById: ignoreStatusById,
|
|
411
|
-
revertStatusById: revertStatusById,
|
|
412
|
-
oneTimeAccrualActionStatusById: oneTimeAccrualActionStatusById,
|
|
413
164
|
fetchState: reducedFetchStatus.fetchState,
|
|
414
165
|
jeScheduleLocalDataById: jeScheduleLocalDataById,
|
|
415
166
|
uiState: uiState,
|
|
@@ -418,26 +169,3 @@ export function getExpenseAutomationJESchedulesView(state) {
|
|
|
418
169
|
completionStatus,
|
|
419
170
|
};
|
|
420
171
|
}
|
|
421
|
-
/**
|
|
422
|
-
* One accrual plus the status of its promote / ignore request, for the detail screen.
|
|
423
|
-
*
|
|
424
|
-
* `accrual` is undefined on a cold load — a refresh or a shared link, where the list has never run
|
|
425
|
-
* — so the screen dispatches `fetchOneTimeAccrual` and waits on `detailFetchState`. The two states
|
|
426
|
-
* are separate on purpose: `actionFetchState` drives the row spinner and the post-revert navigation,
|
|
427
|
-
* and a page load must not look like an action that just finished.
|
|
428
|
-
*/
|
|
429
|
-
export function getExpenseAutomationJEOneTimeAccrualDetailView(state, accrualId) {
|
|
430
|
-
return {
|
|
431
|
-
accrual: getJEOneTimeAccrualByKey(generateJEOneTimeAccrualKey(accrualId), state.jeSchedulesState),
|
|
432
|
-
actionFetchState: state.expenseAutomationJESchedulesViewState
|
|
433
|
-
.oneTimeAccrualActionStatusById[accrualId] ?? {
|
|
434
|
-
fetchState: 'Not-Started',
|
|
435
|
-
error: undefined,
|
|
436
|
-
},
|
|
437
|
-
detailFetchState: state.expenseAutomationJESchedulesViewState
|
|
438
|
-
.oneTimeAccrualFetchStatusById[accrualId] ?? {
|
|
439
|
-
fetchState: 'Not-Started',
|
|
440
|
-
error: undefined,
|
|
441
|
-
},
|
|
442
|
-
};
|
|
443
|
-
}
|
|
@@ -16,8 +16,9 @@ const JE_SCHEDULE_SORT_KEYS = [
|
|
|
16
16
|
'memo',
|
|
17
17
|
];
|
|
18
18
|
export const toJEScheduleSortKey = (v) => stringToUnion(v, JE_SCHEDULE_SORT_KEYS);
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
19
|
+
const JE_SCHEDULE_MAIN_TABS = [
|
|
20
|
+
'pending_review',
|
|
21
|
+
'ongoing',
|
|
22
|
+
'completed',
|
|
23
|
+
];
|
|
24
|
+
export const toJEScheduleMainTab = (v) => stringToUnion(v, JE_SCHEDULE_MAIN_TABS);
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { toAccountPayload } from '../../../entity/account/accountPayload';
|
|
2
|
+
import { toClassBasePayload } from '../../../entity/class/classPayload';
|
|
1
3
|
import { blankInvoicingCatalogSubFamily, isTieredCatalogPricingModel, } from './invoicingCatalogItemFormConfig';
|
|
2
4
|
const CURRENCY_CODE = 'USD';
|
|
3
5
|
const trimOrUndefined = (value) => value.trim() !== '' ? value.trim() : undefined;
|
|
@@ -7,20 +9,26 @@ const toProductCode = (value) => value
|
|
|
7
9
|
.toLowerCase()
|
|
8
10
|
.replace(/[^a-z0-9]+/g, '-')
|
|
9
11
|
.replace(/^-|-$/g, '');
|
|
10
|
-
const buildAccountingDetail = (subFamily) => {
|
|
12
|
+
const buildAccountingDetail = (subFamily, lookup) => {
|
|
11
13
|
const detail = {};
|
|
12
14
|
if (subFamily.sku.trim() !== '') {
|
|
13
15
|
detail.sku = subFamily.sku.trim();
|
|
14
16
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
+
// The account and class travel as whole objects rather than bare codes, built
|
|
18
|
+
// by the same helpers the transaction and vendor payloads use. An id that no
|
|
19
|
+
// longer resolves is dropped: sending a code the service cannot expand is how
|
|
20
|
+
// a mapping silently lands on the wrong account.
|
|
21
|
+
const account = lookup.accountByQboId(subFamily.accountingCode.trim());
|
|
22
|
+
if (account != null) {
|
|
23
|
+
detail.account = toAccountPayload(account);
|
|
17
24
|
}
|
|
18
|
-
|
|
19
|
-
|
|
25
|
+
const accountingClass = lookup.classByQboId(subFamily.accountingCategory.trim());
|
|
26
|
+
if (accountingClass != null) {
|
|
27
|
+
detail.accounting_class = toClassBasePayload(accountingClass);
|
|
20
28
|
}
|
|
21
29
|
return Object.keys(detail).length > 0 ? detail : undefined;
|
|
22
30
|
};
|
|
23
|
-
const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
|
|
31
|
+
const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues, lookup) => {
|
|
24
32
|
const isAddon = localData.catalogType === 'addon';
|
|
25
33
|
const tiered = isTieredCatalogPricingModel(subFamily.pricingModel);
|
|
26
34
|
const name = subFamily.name.trim();
|
|
@@ -74,7 +82,7 @@ const buildSubFamilyPayload = (localData, subFamily, clearEmptyValues) => {
|
|
|
74
82
|
starting_unit: Number(tier.startingUnit) || 1,
|
|
75
83
|
}));
|
|
76
84
|
}
|
|
77
|
-
const accountingDetail = buildAccountingDetail(subFamily);
|
|
85
|
+
const accountingDetail = buildAccountingDetail(subFamily, lookup);
|
|
78
86
|
if (accountingDetail != null) {
|
|
79
87
|
payload.accounting_detail = accountingDetail;
|
|
80
88
|
}
|
|
@@ -86,7 +94,7 @@ const DEFAULT_CATALOG_ITEM_UNIT = 'USD';
|
|
|
86
94
|
* Build the parent catalog-item request body from the form draft. Creates omit
|
|
87
95
|
* both parent and sub-family IDs; edits retain returned sub-family IDs.
|
|
88
96
|
*/
|
|
89
|
-
export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate) => {
|
|
97
|
+
export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate, lookup) => {
|
|
90
98
|
const description = trimOrUndefined(localData.description);
|
|
91
99
|
const productCode = trimOrUndefined(localData.productCode) ?? toProductCode(localData.name);
|
|
92
100
|
const itemPayload = {
|
|
@@ -114,7 +122,7 @@ export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate)
|
|
|
114
122
|
? localData.subFamilies
|
|
115
123
|
: [blankInvoicingCatalogSubFamily()];
|
|
116
124
|
itemPayload.sub_family_details = isCreate
|
|
117
|
-
? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false))
|
|
125
|
+
? subFamilies.map((subFamily) => buildSubFamilyPayload(localData, subFamily, false, lookup))
|
|
118
126
|
: subFamilies.map((subFamily) => {
|
|
119
127
|
const priceCode = trimOrUndefined(subFamily.priceCode) ?? toProductCode(subFamily.name);
|
|
120
128
|
const detail = {
|
|
@@ -124,6 +132,14 @@ export const localDataToSaveInvoicingCatalogItemPayload = (localData, isCreate)
|
|
|
124
132
|
price_code: priceCode,
|
|
125
133
|
show_description_in_invoices: subFamily.showDescriptionInInvoices,
|
|
126
134
|
};
|
|
135
|
+
// Edits send a narrower body than creates, but the accounting mapping
|
|
136
|
+
// is editable on this form, so leaving it out dropped the account and
|
|
137
|
+
// class the user had just picked. `null` rather than omitted when it is
|
|
138
|
+
// empty: an absent key on an update reads as "leave it alone", which
|
|
139
|
+
// would make a cleared mapping impossible to save — the same reason
|
|
140
|
+
// `description` and `invoice_notes` go through `trimOrNull`.
|
|
141
|
+
detail.accounting_detail =
|
|
142
|
+
buildAccountingDetail(subFamily, lookup) ?? null;
|
|
127
143
|
const id = trimOrUndefined(subFamily.id);
|
|
128
144
|
return id != null ? { ...detail, id } : detail;
|
|
129
145
|
});
|
package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/saveInvoicingCatalogItemEpic.js
CHANGED
|
@@ -6,6 +6,7 @@ import { apiErrorSnackbarVariables } from '../../../entity/snackbar/snackbarApiE
|
|
|
6
6
|
import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
|
|
7
7
|
import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
|
|
8
8
|
import { addInvoicingCatalogItem } from '../invoicingCatalogListView/invoicingCatalogListViewReducer';
|
|
9
|
+
import { invoicingQboAccountByQboId, invoicingQboClassByQboId, } from '../invoicingQboView/invoicingQboViewSelector';
|
|
9
10
|
import { localDataToSaveInvoicingCatalogItemPayload, } from './editInvoicingCatalogItemDetailViewPayload';
|
|
10
11
|
import { saveInvoicingCatalogItem, submitInvoicingCatalogItemForm, submitInvoicingCatalogItemFormFailure, submitInvoicingCatalogItemFormSuccess, } from './editInvoicingCatalogItemDetailViewReducer';
|
|
11
12
|
export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter((action) => submitInvoicingCatalogItemForm.match(action) ||
|
|
@@ -20,7 +21,11 @@ export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actio
|
|
|
20
21
|
const viewState = state$.value.editInvoicingCatalogItemDetailViewState;
|
|
21
22
|
const localData = (id != null ? viewState.editDraftById[id] : viewState.newItemDraft) ??
|
|
22
23
|
viewState.newItemDraft;
|
|
23
|
-
|
|
24
|
+
const state = state$.value;
|
|
25
|
+
data = localDataToSaveInvoicingCatalogItemPayload(localData, id == null, {
|
|
26
|
+
accountByQboId: (qboId) => invoicingQboAccountByQboId(state, qboId),
|
|
27
|
+
classByQboId: (qboId) => invoicingQboClassByQboId(state, qboId),
|
|
28
|
+
});
|
|
24
29
|
}
|
|
25
30
|
const baseUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0`;
|
|
26
31
|
const path = id != null
|
|
@@ -37,6 +37,46 @@ export const INVOICING_INCOME_ACCOUNT_TYPES = [
|
|
|
37
37
|
'income',
|
|
38
38
|
'other_income',
|
|
39
39
|
];
|
|
40
|
+
/**
|
|
41
|
+
* The account behind a picker value. The pickers submit the QuickBooks id, so
|
|
42
|
+
* that is what callers hold; the payload builders need the whole entity to send
|
|
43
|
+
* `toAccountPayload`, which is why the lookup lives here next to the options.
|
|
44
|
+
*/
|
|
45
|
+
export const invoicingQboAccountByQboId = (state, qboId) => {
|
|
46
|
+
if (qboId == null || qboId === '') {
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
49
|
+
// `getAccountList` throws when a listed id is missing from the entity slice.
|
|
50
|
+
// That is survivable when looking one account up — the caller falls back to
|
|
51
|
+
// the id it already had — but not when it happens inside an epic, where the
|
|
52
|
+
// throw would take the whole request with it.
|
|
53
|
+
try {
|
|
54
|
+
const { accounts } = getAccountList(state.accountState, state.accountListState, INVOICING_ACCOUNT_LIST_KEY);
|
|
55
|
+
// Matched on any id the account is known by. The pickers submit `qboId`,
|
|
56
|
+
// but a mapping that arrived from the service can name the account by its
|
|
57
|
+
// platform id instead, and an account we cannot resolve is a mapping that
|
|
58
|
+
// cannot be sent as a record.
|
|
59
|
+
return accounts.find((account) => account.qboId === qboId ||
|
|
60
|
+
account.accountId === qboId ||
|
|
61
|
+
account.coaId === qboId);
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
return undefined;
|
|
65
|
+
}
|
|
66
|
+
};
|
|
67
|
+
/** The class behind a picker value, for the same reason as the account above. */
|
|
68
|
+
export const invoicingQboClassByQboId = (state, qboId) => {
|
|
69
|
+
if (qboId == null || qboId === '') {
|
|
70
|
+
return undefined;
|
|
71
|
+
}
|
|
72
|
+
try {
|
|
73
|
+
const { classes } = getClassList(state.classState, state.classListState);
|
|
74
|
+
return classes.find((accountingClass) => accountingClass.qboId === qboId);
|
|
75
|
+
}
|
|
76
|
+
catch {
|
|
77
|
+
return undefined;
|
|
78
|
+
}
|
|
79
|
+
};
|
|
40
80
|
/**
|
|
41
81
|
* Accounts and classes as the invoicing pickers need them. Both come from the
|
|
42
82
|
* shared accounting-service lists, so whatever another screen already loaded
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { of } from 'rxjs';
|
|
2
|
+
import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
|
|
3
|
+
import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
|
|
4
|
+
import { connectInvoicingStripe, fetchInvoicingSettings, invoicingStripeConnectionFailure, updateInvoicingStripeConnection, } from '../settingsViewReducer';
|
|
5
|
+
export const connectInvoicingStripeEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(connectInvoicingStripe.match), mergeMap((action) => {
|
|
6
|
+
const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings/stripe-connect/setup`;
|
|
7
|
+
const { api_key, publishable_key, webhook_secret } = action.payload;
|
|
8
|
+
const body = {
|
|
9
|
+
api_key,
|
|
10
|
+
publishable_key,
|
|
11
|
+
...(webhook_secret != null && webhook_secret !== ''
|
|
12
|
+
? { webhook_secret }
|
|
13
|
+
: {}),
|
|
14
|
+
};
|
|
15
|
+
return zeniAPI
|
|
16
|
+
.postAndGetJSON(apiUrl, body)
|
|
17
|
+
.pipe(switchMap((response) => {
|
|
18
|
+
if (isSuccessResponse(response) && response.data != null) {
|
|
19
|
+
return of(updateInvoicingStripeConnection({
|
|
20
|
+
stripe_connected: response.data.stripe_connected,
|
|
21
|
+
publishable_key: response.data.publishable_key,
|
|
22
|
+
}), fetchInvoicingSettings());
|
|
23
|
+
}
|
|
24
|
+
return of(invoicingStripeConnectionFailure(response.status));
|
|
25
|
+
}), catchError((error) => of(invoicingStripeConnectionFailure(createZeniAPIStatus('Unexpected Error', 'Stripe connect setup REST API call errored out ' +
|
|
26
|
+
JSON.stringify(error))))));
|
|
27
|
+
}));
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { of } from 'rxjs';
|
|
2
|
+
import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
|
|
3
|
+
import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
|
|
4
|
+
import { disconnectInvoicingStripe, fetchInvoicingSettings, invoicingStripeConnectionFailure, updateInvoicingStripeConnection, } from '../settingsViewReducer';
|
|
5
|
+
export const disconnectInvoicingStripeEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(disconnectInvoicingStripe.match), mergeMap(() => {
|
|
6
|
+
const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings/stripe-connect/callback`;
|
|
7
|
+
return zeniAPI
|
|
8
|
+
.deleteAndGetJSON(apiUrl)
|
|
9
|
+
.pipe(switchMap((response) => {
|
|
10
|
+
if (isSuccessResponse(response)) {
|
|
11
|
+
return of(updateInvoicingStripeConnection({
|
|
12
|
+
stripe_connected: false,
|
|
13
|
+
publishable_key: '',
|
|
14
|
+
}), fetchInvoicingSettings());
|
|
15
|
+
}
|
|
16
|
+
return of(invoicingStripeConnectionFailure(response.status));
|
|
17
|
+
}), catchError((error) => of(invoicingStripeConnectionFailure(createZeniAPIStatus('Unexpected Error', 'Stripe disconnect REST API call errored out ' +
|
|
18
|
+
JSON.stringify(error))))));
|
|
19
|
+
}));
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { of } from 'rxjs';
|
|
2
|
+
import { catchError, filter, switchMap } from 'rxjs/operators';
|
|
3
|
+
import { updateAddresses } from '../../../../entity/address/addressReducer';
|
|
4
|
+
import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
|
|
5
|
+
import { fetchInvoicingSettings, updateInvoicingSettings, updateInvoicingSettingsFailure, } from '../settingsViewReducer';
|
|
6
|
+
export const fetchInvoicingSettingsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingSettings.match), switchMap(() => {
|
|
7
|
+
const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/settings`;
|
|
8
|
+
return zeniAPI.getJSON(apiUrl).pipe(switchMap((response) => {
|
|
9
|
+
if (isSuccessResponse(response) && response.data != null) {
|
|
10
|
+
const address = response.data.address;
|
|
11
|
+
return [
|
|
12
|
+
...(address != null ? [updateAddresses([address])] : []),
|
|
13
|
+
updateInvoicingSettings(response.data),
|
|
14
|
+
];
|
|
15
|
+
}
|
|
16
|
+
return of(updateInvoicingSettingsFailure(response.status));
|
|
17
|
+
}), catchError((error) => of(updateInvoicingSettingsFailure(createZeniAPIStatus('Unexpected Error', 'Fetch settings REST API call errored out ' +
|
|
18
|
+
JSON.stringify(error))))));
|
|
19
|
+
}));
|