@zeniai/client-epic-state 4.10.7 → 4.10.9
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/commonPayloadTypes/agingReportPayloadTypes.d.ts +1 -0
- package/lib/commonPayloadTypes/subAccountView/subAccountPayloadHelper.js +2 -2
- package/lib/commonStateTypes/accountView/{getNestedAccountIDHeirarchyForReport.d.ts → getNestedAccountIDHierarchyForReport.d.ts} +2 -2
- package/lib/commonStateTypes/accountView/nestedAccountID.d.ts +2 -2
- package/lib/commonStateTypes/agingBalance/agingBalance.d.ts +4 -0
- package/lib/commonStateTypes/agingBalance/agingBalance.js +4 -1
- package/lib/commonStateTypes/classesView/getNestedClassIDHierarchyForReport.d.ts +2 -2
- package/lib/commonStateTypes/classesView/nestedClassID.d.ts +2 -2
- package/lib/commonStateTypes/customerView/getNestedCustomerHierarchy.d.ts +9 -0
- package/lib/commonStateTypes/customerView/getNestedCustomerHierarchy.js +46 -0
- package/lib/commonStateTypes/customerView/nestedCustomerID.d.ts +42 -0
- package/lib/commonStateTypes/customerView/nestedCustomerID.js +9 -0
- package/lib/commonStateTypes/selectorTypes/classesViewSelectorReport.d.ts +2 -2
- package/lib/commonStateTypes/viewAndReport/agingReportStateTypes.d.ts +4 -7
- package/lib/entity/account/subAccountSelector.d.ts +1 -1
- package/lib/entity/account/subAccountSelector.js +7 -7
- package/lib/entity/accountGroup/accountGroupV2Selector.js +3 -3
- package/lib/entity/class/classSelectorV2.d.ts +1 -1
- package/lib/entity/class/classSelectorV2.js +10 -10
- package/lib/entity/customer/customerPayload.d.ts +1 -1
- package/lib/entity/customer/customerPayload.js +1 -1
- package/lib/entity/customer/customerReducer.d.ts +1 -1
- package/lib/entity/customer/customerSelector.d.ts +1 -1
- package/lib/entity/customerIncome/customerIncomeTrend.d.ts +1 -1
- package/lib/entity/customerIncome/customerIncomeTrendReducer.d.ts +1 -1
- package/lib/entity/sectionAccountsView/getNestedAccountIDHierarchyForSection.js +9 -9
- package/lib/entity/sectionAccountsView/sectionAccountsViewEpic.js +2 -2
- package/lib/entity/sectionAccountsView/sectionAccountsViewSelector.js +3 -3
- package/lib/entity/sectionClassesViewV2/sectionClassesViewEpic.js +2 -2
- package/lib/entity/sectionClassesViewV2/sectionClassesViewSelector.js +7 -7
- package/lib/entity/sectionClassesViewV2/selectorHelpers/getNestedClassIDHierarchyForSection.js +7 -7
- package/lib/entity/transaction/stateTypes/customerTransaction.d.ts +1 -1
- package/lib/entity/transaction/stateTypes/transactionLine.d.ts +1 -1
- package/lib/index.d.ts +14 -12
- package/lib/index.js +7 -6
- package/lib/reducer.d.ts +1 -1
- package/lib/view/accountList/accountListReducer.js +2 -2
- package/lib/view/accountList/accountListSelector.d.ts +3 -3
- package/lib/view/accountList/accountListSelector.js +3 -3
- package/lib/view/accountList/accountListState.d.ts +2 -2
- package/lib/view/accountMappingView/accountMappingPayload.js +25 -0
- package/lib/view/accountMappingView/accountMappingReducer.js +19 -19
- package/lib/view/accountMappingView/accountMappingState.d.ts +8 -8
- package/lib/view/accountMappingView/accountMappingViewSelector.d.ts +8 -8
- package/lib/view/accountMappingView/accountMappingViewSelector.js +7 -7
- package/lib/view/apAgingView/apAgingReport/apAgingReducer.d.ts +7 -5
- package/lib/view/apAgingView/apAgingReport/apAgingReducer.js +34 -15
- package/lib/view/apAgingView/apAgingReport/apAgingSelector.d.ts +1 -1
- package/lib/view/apAgingView/apAgingReport/apAgingSelector.js +29 -16
- package/lib/view/apAgingView/apAgingReport/apAgingState.d.ts +6 -3
- package/lib/view/apAgingView/apAgingReport/fetchApAgingEpic.js +11 -7
- package/lib/view/arAgingView/arAgingDetail/arAgingDetailSelector.d.ts +1 -1
- package/lib/view/arAgingView/arAgingReport/arAgingPayload.js +8 -1
- package/lib/view/arAgingView/arAgingReport/arAgingReducer.d.ts +13 -7
- package/lib/view/arAgingView/arAgingReport/arAgingReducer.js +49 -15
- package/lib/view/arAgingView/arAgingReport/arAgingSelector.d.ts +12 -6
- package/lib/view/arAgingView/arAgingReport/arAgingSelector.js +68 -35
- package/lib/view/arAgingView/arAgingReport/arAgingState.d.ts +12 -4
- package/lib/view/arAgingView/arAgingReport/fetchArAgingEpic.js +10 -7
- package/lib/view/classList/classListSelector.d.ts +3 -3
- package/lib/view/classList/classListSelector.js +3 -3
- package/lib/view/classList/classListState.d.ts +2 -2
- package/lib/view/commonVendorView/transactionVendorView/transactionVendorViewSelector.d.ts +4 -4
- package/lib/view/commonVendorView/transactionVendorView/transactionVendorViewSelector.js +4 -4
- package/lib/view/commonVendorView/vendorView/vendorViewSelector.d.ts +4 -4
- package/lib/view/commonVendorView/vendorView/vendorViewSelector.js +4 -4
- package/lib/view/commonVendorView/vendorsTabVendorView/vendorsTabVendorViewSelector.d.ts +4 -4
- package/lib/view/commonVendorView/vendorsTabVendorView/vendorsTabVendorViewSelector.js +4 -4
- package/lib/view/dashboard/dashboardEpic.js +6 -4
- package/lib/view/netBurnOrIncomeClassesView/netBurnOrIncomeClassesViewReducer.js +3 -3
- package/lib/view/netBurnOrIncomeClassesView/netBurnOrIncomeClassesViewSelector.js +3 -3
- package/lib/view/netBurnOrIncomeClassesView/netBurnOrIncomeClassesViewState.d.ts +2 -2
- package/lib/view/opExClassesView/opExClassesViewReducer.js +3 -3
- package/lib/view/opExClassesView/opExClassesViewSelector.js +3 -3
- package/lib/view/opExClassesView/opExClassesViewState.d.ts +2 -2
- package/lib/view/profitAndLossClassesView/profitAndLossClassesViewReducer.js +3 -3
- package/lib/view/profitAndLossClassesView/profitAndLossClassesViewSelector.js +2 -2
- package/lib/view/profitAndLossClassesView/profitAndLossClassesViewState.d.ts +2 -2
- package/lib/view/revenueClassesView/revenueClassesViewReducer.js +3 -3
- package/lib/view/revenueClassesView/revenueClassesViewSelector.js +3 -3
- package/lib/view/revenueClassesView/revenueClassesViewState.d.ts +2 -2
- package/lib/view/scheduleView/scheduleDetailView/scheduleDetailSelector.d.ts +5 -5
- package/lib/view/scheduleView/scheduleDetailView/scheduleDetailSelector.js +5 -5
- package/lib/view/scheduleView/scheduleListView/scheduleListHelper.d.ts +2 -2
- package/lib/view/scheduleView/scheduleListView/scheduleListSelector.d.ts +2 -2
- package/lib/view/scheduleView/scheduleListView/scheduleListSelector.js +1 -1
- package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.d.ts +4 -4
- package/lib/view/spendManagement/billPay/editBillView/editBillViewSelector.js +4 -4
- package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewSelector.d.ts +4 -4
- package/lib/view/spendManagement/reimbursement/editRemiView/editRemiViewSelector.js +4 -4
- package/lib/view/transactionDetail/transactionDetailSelector.d.ts +4 -4
- package/lib/view/transactionDetail/transactionDetailSelector.js +4 -4
- package/lib/view/transactionDetail/transactionDetailState.d.ts +1 -1
- package/lib/view/transactionDetail/transactionDetailTypes.d.ts +1 -1
- package/package.json +1 -1
- package/lib/commonStateTypes/accountView/{getNestedAccountIDHeirarchyForReport.js → getNestedAccountIDHierarchyForReport.js} +0 -0
- package/lib/entity/customer/{customer.d.ts → customerState.d.ts} +4 -4
- /package/lib/entity/customer/{customer.js → customerState.js} +0 -0
|
@@ -1,10 +1,18 @@
|
|
|
1
1
|
import { FetchStateAndError, ID } from '../../../commonStateTypes/common';
|
|
2
|
-
import {
|
|
3
|
-
import { AgingBalance, AgingPeriod } from '../../../commonStateTypes/agingBalance/agingBalance';
|
|
2
|
+
import { AgingBalance, AgingBalancesKey, AgingPeriod } from '../../../commonStateTypes/agingBalance/agingBalance';
|
|
4
3
|
import { AgingReportUIState } from '../../../commonStateTypes/viewAndReport/agingReportStateTypes';
|
|
5
|
-
|
|
4
|
+
import { NestedCustomerHierarchy } from '../../../commonStateTypes/customerView/nestedCustomerID';
|
|
5
|
+
import { ReportV2 } from '../../../commonStateTypes/v2/viewAndReport';
|
|
6
|
+
export interface ARAgingBalancesByAgingBalancesKey {
|
|
6
7
|
arAgingBalancesByCustomerId: Record<ID, AgingBalance[]>;
|
|
7
|
-
|
|
8
|
+
nestedCustomerHierarchy: NestedCustomerHierarchy[];
|
|
8
9
|
arAgingTotals: AgingBalance[];
|
|
10
|
+
}
|
|
11
|
+
export interface ArAgingUIState extends AgingReportUIState {
|
|
12
|
+
nodeCollapseState: Record<ID, boolean>;
|
|
13
|
+
}
|
|
14
|
+
export interface ArAgingState extends ReportV2, FetchStateAndError {
|
|
15
|
+
arAgingBalancesByDate: Record<AgingBalancesKey, ARAgingBalancesByAgingBalancesKey>;
|
|
16
|
+
uiState: ArAgingUIState;
|
|
9
17
|
agingPeriods: AgingPeriod[];
|
|
10
18
|
}
|
|
@@ -6,22 +6,25 @@ const operators_1 = require("rxjs/operators");
|
|
|
6
6
|
const customerReducer_1 = require("../../../entity/customer/customerReducer");
|
|
7
7
|
const responsePayload_1 = require("../../../responsePayload");
|
|
8
8
|
const arAgingReducer_1 = require("./arAgingReducer");
|
|
9
|
+
const agingBalance_1 = require("../../../commonStateTypes/agingBalance/agingBalance");
|
|
9
10
|
const fetchArAgingEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(arAgingReducer_1.fetchArAging.match), (0, operators_1.switchMap)((action) => {
|
|
10
|
-
|
|
11
|
-
const state = state$.value;
|
|
12
|
-
const { reportDate } = action.payload;
|
|
11
|
+
const { reportDate, cacheOverride } = action.payload;
|
|
13
12
|
const queryParam = {
|
|
14
|
-
report_date: reportDate
|
|
15
|
-
? reportDate.format('YYYY-MM-DD')
|
|
16
|
-
: (_a = state.arAgingState.uiState.selectedDate) === null || _a === void 0 ? void 0 : _a.date.format('YYYY-MM-DD'),
|
|
13
|
+
report_date: reportDate.format('YYYY-MM-DD'),
|
|
17
14
|
};
|
|
15
|
+
const arAgingState = state$.value.arAgingState;
|
|
16
|
+
const key = (0, agingBalance_1.getAgingBalancesKey)(reportDate);
|
|
17
|
+
if (arAgingState.arAgingBalancesByDate[key] != null &&
|
|
18
|
+
cacheOverride === false) {
|
|
19
|
+
return (0, rxjs_1.from)([]);
|
|
20
|
+
}
|
|
18
21
|
return zeniAPI
|
|
19
22
|
.getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/2.0/reports/accounts_receivable_aging?query=${encodeURIComponent(JSON.stringify(queryParam))}`)
|
|
20
23
|
.pipe((0, operators_1.mergeMap)((response) => {
|
|
21
24
|
if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
|
|
22
25
|
const actions = [
|
|
23
26
|
(0, customerReducer_1.updateCustomers)(response.data.report.customers),
|
|
24
|
-
(0, arAgingReducer_1.updateArAgingOnSuccess)(response.data.report),
|
|
27
|
+
(0, arAgingReducer_1.updateArAgingOnSuccess)(reportDate, response.data.report),
|
|
25
28
|
];
|
|
26
29
|
return (0, rxjs_1.from)(actions);
|
|
27
30
|
}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { SelectorView } from '../../commonStateTypes/viewAndReport/viewAndReport';
|
|
2
2
|
import { ClassBase, ClassState } from '../../entity/class/classState';
|
|
3
3
|
import { ClassListState } from './classListState';
|
|
4
|
-
import {
|
|
4
|
+
import { NestedClassHierarchyForReport } from '../../commonStateTypes/classesView/nestedClassID';
|
|
5
5
|
export interface ClassListSelectorView extends SelectorView {
|
|
6
6
|
classes: ClassBase[];
|
|
7
|
-
nestedClassHierarchy:
|
|
7
|
+
nestedClassHierarchy: NestedClassHierarchyForReport[];
|
|
8
8
|
}
|
|
9
9
|
export declare const getClassList: (classState: ClassState, classListState: ClassListState) => ClassListSelectorView;
|
|
10
|
-
export declare const
|
|
10
|
+
export declare const getNestedClassListHierarchy: (classListState: ClassListState) => NestedClassHierarchyForReport[];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getNestedClassListHierarchy = exports.getClassList = void 0;
|
|
4
4
|
const classSelector_1 = require("../../entity/class/classSelector");
|
|
5
5
|
// TODO - Fix return type, currently it's returning Class[] but ClassListSelectorView --> classes is ClassBase[]
|
|
6
6
|
const getClassList = (classState, classListState) => {
|
|
@@ -16,7 +16,7 @@ const getClassList = (classState, classListState) => {
|
|
|
16
16
|
};
|
|
17
17
|
};
|
|
18
18
|
exports.getClassList = getClassList;
|
|
19
|
-
const
|
|
19
|
+
const getNestedClassListHierarchy = (classListState) => {
|
|
20
20
|
return classListState.nestedClassHierarchy;
|
|
21
21
|
};
|
|
22
|
-
exports.
|
|
22
|
+
exports.getNestedClassListHierarchy = getNestedClassListHierarchy;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { NestedClassHierarchyForReport } from '../../commonStateTypes/classesView/nestedClassID';
|
|
2
2
|
import { FetchedState, ID } from '../../commonStateTypes/common';
|
|
3
3
|
export interface ClassListState extends FetchedState {
|
|
4
4
|
classIds: ID[];
|
|
5
|
-
nestedClassHierarchy:
|
|
5
|
+
nestedClassHierarchy: NestedClassHierarchyForReport[];
|
|
6
6
|
}
|
|
@@ -6,8 +6,8 @@ import { AccountListSelectorView } from '../../accountList/accountListSelector';
|
|
|
6
6
|
import { ClassListSelectorView } from '../../classList/classListSelector';
|
|
7
7
|
import { User } from '../../../entity/user/userState';
|
|
8
8
|
import { TransactionID } from '../../../entity/transaction/stateTypes/transaction';
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
9
|
+
import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
|
|
10
|
+
import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
|
|
11
11
|
export interface TransactionVendorDetails {
|
|
12
12
|
saveStatus: FetchStateAndError;
|
|
13
13
|
vendorDetailLocalData?: TransactionVendorLocalData;
|
|
@@ -16,8 +16,8 @@ export interface TransactionVendorDetails {
|
|
|
16
16
|
export interface TransactionVendorSelectorView extends SelectorView {
|
|
17
17
|
accountList: AccountListSelectorView;
|
|
18
18
|
classList: ClassListSelectorView;
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
accountsHierarchyList: NestedAccountHierarchyForReport[];
|
|
20
|
+
classHierarchyList: NestedClassHierarchyForReport[];
|
|
21
21
|
ownerList: User[];
|
|
22
22
|
editVendorState?: TransactionVendorDetails;
|
|
23
23
|
newVendorState?: TransactionVendorDetails;
|
|
@@ -35,13 +35,13 @@ const getTransactionVendorView = (state, vendorId) => {
|
|
|
35
35
|
{ fetchState: classList.fetchState, error: classList.error },
|
|
36
36
|
]);
|
|
37
37
|
}
|
|
38
|
-
const
|
|
39
|
-
const
|
|
38
|
+
const accountsHierarchyList = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'accountList');
|
|
39
|
+
const classHierarchyList = (0, classListSelector_1.getNestedClassListHierarchy)(classListState);
|
|
40
40
|
return {
|
|
41
41
|
accountList: accountList,
|
|
42
42
|
classList: classList,
|
|
43
|
-
|
|
44
|
-
|
|
43
|
+
accountsHierarchyList,
|
|
44
|
+
classHierarchyList,
|
|
45
45
|
ownerList: ownerList,
|
|
46
46
|
editVendorState: editVendorState,
|
|
47
47
|
newVendorState: newVendorState,
|
|
@@ -18,8 +18,8 @@ import { VendorSpend } from '../../../entity/vendorExpense/vendorExpenseState';
|
|
|
18
18
|
import { Entity } from '../../../entity/genericEntity/entity';
|
|
19
19
|
import { File } from '../../../entity/file/fileState';
|
|
20
20
|
import { VendorType } from '../../vendorTypeList/vendorTypeListPayload';
|
|
21
|
-
import {
|
|
22
|
-
import {
|
|
21
|
+
import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
|
|
22
|
+
import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
|
|
23
23
|
import { PaymentInstrument } from '../../../entity/paymentInstrument/paymentInstrument';
|
|
24
24
|
export interface VendorDetails {
|
|
25
25
|
vendorBasic: VendorBasic | undefined;
|
|
@@ -50,8 +50,8 @@ export interface VendorBasic {
|
|
|
50
50
|
export interface VendorViewSelectorView extends BankAccountSelectorView, SelectorView {
|
|
51
51
|
accountList: AccountListSelectorView;
|
|
52
52
|
classList: ClassListSelectorView;
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
accountsHierarchyList: NestedAccountHierarchyForReport[];
|
|
54
|
+
classHierarchyList: NestedClassHierarchyForReport[];
|
|
55
55
|
vendorTypeList: VendorType[];
|
|
56
56
|
ownerList: User[];
|
|
57
57
|
editVendorState?: VendorDetails;
|
|
@@ -112,14 +112,14 @@ const getVendorView = (state, vendorIdFromUrl) => {
|
|
|
112
112
|
(configDetails.method.includes('international') === true &&
|
|
113
113
|
configDetails.isEnabled === true));
|
|
114
114
|
}, false);
|
|
115
|
-
const
|
|
116
|
-
const
|
|
115
|
+
const accountsHierarchyList = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'billPayAccountList');
|
|
116
|
+
const classHierarchyList = (0, classListSelector_1.getNestedClassListHierarchy)(classListState);
|
|
117
117
|
const loggedInUserVerification = Object.assign(Object.assign({}, vendorViewState.loggedInUserVerification), { phone: (_1 = vendorViewState.loggedInUserVerification.phone) !== null && _1 !== void 0 ? _1 : (_3 = (0, userSelector_1.getUserByUserId)(userState, (_2 = vendorViewState.loggedInUserVerification.userId) !== null && _2 !== void 0 ? _2 : '')) === null || _3 === void 0 ? void 0 : _3.phone });
|
|
118
118
|
return Object.assign(Object.assign({}, bankAccount), { bankAccountCreationState: {
|
|
119
119
|
fetchState: bankAccount.fetchState,
|
|
120
120
|
error: bankAccount.error,
|
|
121
|
-
}, accountList: accountList, classList: classList,
|
|
122
|
-
|
|
121
|
+
}, accountList: accountList, classList: classList, accountsHierarchyList,
|
|
122
|
+
classHierarchyList, vendorTypeList: vendorTypeList, ownerList: ownerList, editVendorState: editVendorState, newVendorState: newVendorState, error: fetchState.error, version: 0, fetchState: fetchState.fetchState, hasWireTransfer,
|
|
123
123
|
hasInternationalWireTransfer,
|
|
124
124
|
deleteFileStatusById,
|
|
125
125
|
updateFileStatusById,
|
|
@@ -10,8 +10,8 @@ import { TrendWithTransactionsView } from '../../trendWithTransactions/trendWith
|
|
|
10
10
|
import { User } from '../../../entity/user/userState';
|
|
11
11
|
import { VendorSpend } from '../../../entity/vendorExpense/vendorExpenseState';
|
|
12
12
|
import { Entity } from '../../../entity/genericEntity/entity';
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
13
|
+
import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
|
|
14
|
+
import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
|
|
15
15
|
import { TransactionListByEntityView } from '../../transactionList/transactionListByEntitySelector';
|
|
16
16
|
import { TimePeriod } from '../../../commonStateTypes/timePeriod';
|
|
17
17
|
import { Month } from '../../../commonStateTypes/timePeriod';
|
|
@@ -34,8 +34,8 @@ export interface VendorsTabVendorBasic {
|
|
|
34
34
|
export interface VendorsTabVendorViewSelectorView extends SelectorView {
|
|
35
35
|
accountList: AccountListSelectorView;
|
|
36
36
|
classList: ClassListSelectorView;
|
|
37
|
-
|
|
38
|
-
|
|
37
|
+
accountsHierarchyList: NestedAccountHierarchyForReport[];
|
|
38
|
+
classHierarchyList: NestedClassHierarchyForReport[];
|
|
39
39
|
ownerList: User[];
|
|
40
40
|
vendorView?: VendorsTabVendorDetails;
|
|
41
41
|
}
|
|
@@ -54,13 +54,13 @@ const getVendorsTabVendorView = (state, vendorIdFromUrl) => {
|
|
|
54
54
|
fetchState: 'Not-Started',
|
|
55
55
|
},
|
|
56
56
|
]);
|
|
57
|
-
const
|
|
58
|
-
const
|
|
57
|
+
const accountsHierarchyList = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'accountList');
|
|
58
|
+
const classHierarchyList = (0, classListSelector_1.getNestedClassListHierarchy)(classListState);
|
|
59
59
|
return {
|
|
60
60
|
accountList: accountList,
|
|
61
61
|
classList: classList,
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
accountsHierarchyList,
|
|
63
|
+
classHierarchyList,
|
|
64
64
|
ownerList: ownerList,
|
|
65
65
|
vendorView: vendorDetailState,
|
|
66
66
|
error: fetchState.error,
|
|
@@ -36,6 +36,8 @@ const fetchDashboardEpic = (actions$, state$) => actions$.pipe((0, operators_1.f
|
|
|
36
36
|
? (0, userRoleType_1.hasAdminLevelAccess)(currentTenant.userRole)
|
|
37
37
|
: false;
|
|
38
38
|
const isInvestorBanker = (0, userRoleType_1.hasInvestorBankerLevelAccess)(currentTenant.userRole);
|
|
39
|
+
const arAgingDate = state$.value.arAgingState.uiState.selectedDate;
|
|
40
|
+
const apAgingDate = state$.value.apAgingState.uiState.selectedDate;
|
|
39
41
|
if (cacheOverride === true) {
|
|
40
42
|
const actions = [
|
|
41
43
|
(0, tenantReducer_1.fetchAllTenants)(userId),
|
|
@@ -53,10 +55,10 @@ const fetchDashboardEpic = (actions$, state$) => actions$.pipe((0, operators_1.f
|
|
|
53
55
|
(0, tasksCardReducer_1.fetchTasksCard)(),
|
|
54
56
|
];
|
|
55
57
|
if (excludeResources.includes('accounts_payable_aging') === false) {
|
|
56
|
-
actions.push((0, apAgingReducer_1.fetchApAging)());
|
|
58
|
+
actions.push((0, apAgingReducer_1.fetchApAging)(apAgingDate));
|
|
57
59
|
}
|
|
58
60
|
if (excludeResources.includes('accounts_receivable_aging') === false) {
|
|
59
|
-
actions.push((0, arAgingReducer_1.fetchArAging)());
|
|
61
|
+
actions.push((0, arAgingReducer_1.fetchArAging)(arAgingDate));
|
|
60
62
|
}
|
|
61
63
|
if (excludeResources.includes('zeni_accounts_promo_card') === false) {
|
|
62
64
|
actions.push((0, zeniAccountsPromoCardReducer_1.fetchZeniAccountsPromoCard)());
|
|
@@ -133,12 +135,12 @@ const fetchDashboardEpic = (actions$, state$) => actions$.pipe((0, operators_1.f
|
|
|
133
135
|
if (state.apAgingState.fetchState !== 'In-Progress' &&
|
|
134
136
|
state.apAgingState.fetchState !== 'Completed' &&
|
|
135
137
|
excludeResources.includes('accounts_payable_aging') === false) {
|
|
136
|
-
fetchActions.push((0, apAgingReducer_1.fetchApAging)());
|
|
138
|
+
fetchActions.push((0, apAgingReducer_1.fetchApAging)(apAgingDate));
|
|
137
139
|
}
|
|
138
140
|
if (state.arAgingState.fetchState !== 'In-Progress' &&
|
|
139
141
|
state.arAgingState.fetchState !== 'Completed' &&
|
|
140
142
|
excludeResources.includes('accounts_receivable_aging') === false) {
|
|
141
|
-
fetchActions.push((0, arAgingReducer_1.fetchArAging)());
|
|
143
|
+
fetchActions.push((0, arAgingReducer_1.fetchArAging)(arAgingDate));
|
|
142
144
|
}
|
|
143
145
|
if (state.zeniAccountsPromoCardState.fetchState !== 'In-Progress' &&
|
|
144
146
|
!state.zeniAccountsPromoCardState.hasValidState() &&
|
|
@@ -7,7 +7,7 @@ const getNestedClassIDHierarchyForReport_1 = require("../../commonStateTypes/cla
|
|
|
7
7
|
const classPayload_1 = require("../../entity/class/classPayload");
|
|
8
8
|
const viewAndReportPayloadv2_1 = require("../../commonPayloadTypes/v2/viewAndReportPayloadv2");
|
|
9
9
|
exports.initialState = {
|
|
10
|
-
|
|
10
|
+
classHierarchy: [],
|
|
11
11
|
fetchState: {
|
|
12
12
|
month: {
|
|
13
13
|
fetchState: 'Not-Started',
|
|
@@ -115,7 +115,7 @@ const doUpdatedNetBurnOrIncomeClassesView = (draft, timeframe, netBurnReport) =>
|
|
|
115
115
|
draft.firstMonthOfFY = report.firstMonthOfFY;
|
|
116
116
|
draft.fetchState[timeframe].fetchState = 'Completed';
|
|
117
117
|
const classMetadata = netBurnReport.report.classes.map((eachClass) => (0, classPayload_1.toClassMetadata)(eachClass));
|
|
118
|
-
if (draft.
|
|
119
|
-
draft.
|
|
118
|
+
if (draft.classHierarchy.length <= 0) {
|
|
119
|
+
draft.classHierarchy = (0, getNestedClassIDHierarchyForReport_1.geNestedClassIDHierarchyForReport)(classMetadata);
|
|
120
120
|
}
|
|
121
121
|
};
|
|
@@ -18,7 +18,7 @@ const getNetBurnOrIncomeClassesView = (filter, accountState, classState, section
|
|
|
18
18
|
const reportId = 'net_burn_or_income_by_classes';
|
|
19
19
|
const sections = {};
|
|
20
20
|
const calculatedSections = {};
|
|
21
|
-
let
|
|
21
|
+
let classHierarchy = [];
|
|
22
22
|
let insights = [];
|
|
23
23
|
let reportTitle = netBurnOrIncomeClassesViewState.reportTitle;
|
|
24
24
|
if (fetchState.fetchState === 'Completed') {
|
|
@@ -35,7 +35,7 @@ const getNetBurnOrIncomeClassesView = (filter, accountState, classState, section
|
|
|
35
35
|
calculatedSections['grossBurn'] = (0, coaBalance_1.getCOABalances)(grossBurnBalancesByPeriod, filter);
|
|
36
36
|
const netBurnOrIncomeBalances = (0, getDifferenceOfBalancesGroupedByPeriod_1.getDifferenceOfBalancesGroupedByPeriod)(sections['income'].sectionBalancesTotalByPeriod, grossBurnBalancesByPeriod);
|
|
37
37
|
calculatedSections['netBurnOrIncome'] = (0, coaBalance_1.getCOABalances)(netBurnOrIncomeBalances, filter);
|
|
38
|
-
|
|
38
|
+
classHierarchy = netBurnOrIncomeClassesViewState.classHierarchy;
|
|
39
39
|
insights = netBurnOrIncomeWithForecastState.netBurnOrIncome.insights;
|
|
40
40
|
const balancesAmountTotal = calculatedSections['netBurnOrIncome'].balances.reduce((summation, currentBalance) => summation + currentBalance.balance.amount, 0);
|
|
41
41
|
reportTitle =
|
|
@@ -56,7 +56,7 @@ const getNetBurnOrIncomeClassesView = (filter, accountState, classState, section
|
|
|
56
56
|
error: fetchState.error,
|
|
57
57
|
filter: filter,
|
|
58
58
|
uiState: netBurnOrIncomeClassesViewState.uiState,
|
|
59
|
-
|
|
59
|
+
classHierarchy,
|
|
60
60
|
classesToFilterOut: netBurnOrIncomeClassesViewState.uiState.classesToFilterOut,
|
|
61
61
|
idsInOrder: netBurnOrIncomeIdsInOrder,
|
|
62
62
|
insights,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AccountViewMode, FetchStateAndError, ID } from '../../commonStateTypes/common';
|
|
2
2
|
import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
|
|
3
|
-
import { NestedClassID,
|
|
3
|
+
import { NestedClassID, NestedClassHierarchyForReport } from '../../commonStateTypes/classesView/nestedClassID';
|
|
4
4
|
export interface NetBurnOrIncomeClassesViewUIState {
|
|
5
5
|
classesToFilterOut: NestedClassID[];
|
|
6
6
|
nodeCollapseState: Record<ID, boolean>;
|
|
@@ -11,7 +11,7 @@ export interface NetBurnOrIncomeClassesViewUIState {
|
|
|
11
11
|
} | undefined;
|
|
12
12
|
}
|
|
13
13
|
export interface NetBurnOrIncomeClassesViewState extends Report {
|
|
14
|
-
|
|
14
|
+
classHierarchy: NestedClassHierarchyForReport[];
|
|
15
15
|
fetchState: {
|
|
16
16
|
month: FetchStateAndError;
|
|
17
17
|
quarter: FetchStateAndError;
|
|
@@ -7,7 +7,7 @@ const getNestedClassIDHierarchyForReport_1 = require("../../commonStateTypes/cla
|
|
|
7
7
|
const classPayload_1 = require("../../entity/class/classPayload");
|
|
8
8
|
const viewAndReportPayloadv2_1 = require("../../commonPayloadTypes/v2/viewAndReportPayloadv2");
|
|
9
9
|
exports.initialState = {
|
|
10
|
-
|
|
10
|
+
classHierarchy: [],
|
|
11
11
|
fetchState: {
|
|
12
12
|
month: {
|
|
13
13
|
fetchState: 'Not-Started',
|
|
@@ -116,7 +116,7 @@ const doUpdatedOpExClassesView = (draft, timeframe, opExReport) => {
|
|
|
116
116
|
draft.bookCloseDate = report.bookCloseDate;
|
|
117
117
|
draft.fetchState[timeframe].fetchState = 'Completed';
|
|
118
118
|
const classMetadata = opExReport.report.classes.map((eachClass) => (0, classPayload_1.toClassMetadata)(eachClass));
|
|
119
|
-
if (draft.
|
|
120
|
-
draft.
|
|
119
|
+
if (draft.classHierarchy.length <= 0) {
|
|
120
|
+
draft.classHierarchy = (0, getNestedClassIDHierarchyForReport_1.geNestedClassIDHierarchyForReport)(classMetadata);
|
|
121
121
|
}
|
|
122
122
|
};
|
|
@@ -15,7 +15,7 @@ const getOpExClassesView = (filter, accountState, classState, sectionsState, opE
|
|
|
15
15
|
const sectionId = 'expenses';
|
|
16
16
|
const sections = {};
|
|
17
17
|
const calculatedSections = {};
|
|
18
|
-
let
|
|
18
|
+
let classHierarchy = [];
|
|
19
19
|
let insights = [];
|
|
20
20
|
if (fetchState.fetchState === 'Completed') {
|
|
21
21
|
sections.expenses = (0, sectionClassesViewSelector_1.getSectionClassesViewReport)(accountState, classState, sectionsState, {
|
|
@@ -25,7 +25,7 @@ const getOpExClassesView = (filter, accountState, classState, sectionsState, opE
|
|
|
25
25
|
// ALL_OPEX_CLASSES_VIEW_SECTION_IDS.forEach((sectionId) => {
|
|
26
26
|
// sections[`${sectionId}`] =
|
|
27
27
|
// });
|
|
28
|
-
|
|
28
|
+
classHierarchy = opExClassesViewState.classHierarchy;
|
|
29
29
|
insights = opExWithForecastState.opEx.insights;
|
|
30
30
|
}
|
|
31
31
|
return {
|
|
@@ -42,7 +42,7 @@ const getOpExClassesView = (filter, accountState, classState, sectionsState, opE
|
|
|
42
42
|
error: fetchState.error,
|
|
43
43
|
filter: filter,
|
|
44
44
|
uiState: opExClassesViewState.uiState,
|
|
45
|
-
|
|
45
|
+
classHierarchy,
|
|
46
46
|
classesToFilterOut: opExClassesViewState.uiState.classesToFilterOut,
|
|
47
47
|
idsInOrder: exports.opExIdsInOrder,
|
|
48
48
|
insights,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ID, AccountViewMode, FetchStateAndError } from '../../commonStateTypes/common';
|
|
2
2
|
import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
|
|
3
|
-
import { NestedClassID,
|
|
3
|
+
import { NestedClassID, NestedClassHierarchyForReport } from '../../commonStateTypes/classesView/nestedClassID';
|
|
4
4
|
export interface OpExClassesViewUIState {
|
|
5
5
|
classesToFilterOut: NestedClassID[];
|
|
6
6
|
nodeCollapseState: Record<ID, boolean>;
|
|
@@ -11,7 +11,7 @@ export interface OpExClassesViewUIState {
|
|
|
11
11
|
} | undefined;
|
|
12
12
|
}
|
|
13
13
|
export interface OpExClassesViewState extends Report {
|
|
14
|
-
|
|
14
|
+
classHierarchy: NestedClassHierarchyForReport[];
|
|
15
15
|
fetchState: {
|
|
16
16
|
month: FetchStateAndError;
|
|
17
17
|
quarter: FetchStateAndError;
|
|
@@ -7,7 +7,7 @@ const getNestedClassIDHierarchyForReport_1 = require("../../commonStateTypes/cla
|
|
|
7
7
|
const classPayload_1 = require("../../entity/class/classPayload");
|
|
8
8
|
const viewAndReportPayloadv2_1 = require("../../commonPayloadTypes/v2/viewAndReportPayloadv2");
|
|
9
9
|
exports.initialState = {
|
|
10
|
-
|
|
10
|
+
classHierarchy: [],
|
|
11
11
|
bookCloseDate: undefined,
|
|
12
12
|
fetchState: {
|
|
13
13
|
month: {
|
|
@@ -120,7 +120,7 @@ const doUpdatedProfitAndLossClassesView = (draft, timeframe, pandLReport) => {
|
|
|
120
120
|
draft.bookCloseDate = report.bookCloseDate;
|
|
121
121
|
draft.fetchState[timeframe].fetchState = 'Completed';
|
|
122
122
|
const classMetadata = pandLReport.report.classes.map((eachClass) => (0, classPayload_1.toClassMetadata)(eachClass));
|
|
123
|
-
if (draft.
|
|
124
|
-
draft.
|
|
123
|
+
if (draft.classHierarchy.length <= 0) {
|
|
124
|
+
draft.classHierarchy = (0, getNestedClassIDHierarchyForReport_1.geNestedClassIDHierarchyForReport)(classMetadata);
|
|
125
125
|
}
|
|
126
126
|
};
|
|
@@ -47,7 +47,7 @@ const getProfitAndLossClassesView = (filter, accountState, classState, sectionsS
|
|
|
47
47
|
: ebitBalancesByPeriod;
|
|
48
48
|
calculatedSections['netIncome'] = (0, coaBalance_1.getCOABalances)(netIncomeBalances, filter);
|
|
49
49
|
}
|
|
50
|
-
const
|
|
50
|
+
const classHierarchy = profitAndLossClassesViewState.classHierarchy;
|
|
51
51
|
return {
|
|
52
52
|
sections,
|
|
53
53
|
calculatedSections,
|
|
@@ -62,7 +62,7 @@ const getProfitAndLossClassesView = (filter, accountState, classState, sectionsS
|
|
|
62
62
|
error: fetchState.error,
|
|
63
63
|
filter: filter,
|
|
64
64
|
uiState: profitAndLossClassesViewState.uiState,
|
|
65
|
-
|
|
65
|
+
classHierarchy,
|
|
66
66
|
classesToFilterOut: profitAndLossClassesViewState.uiState.classesToFilterOut,
|
|
67
67
|
idsInOrder: exports.profitAndLossIdsInOrder,
|
|
68
68
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AccountViewMode, FetchStateAndError, ID } from '../../commonStateTypes/common';
|
|
2
2
|
import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
|
|
3
|
-
import { NestedClassID,
|
|
3
|
+
import { NestedClassID, NestedClassHierarchyForReport } from '../../commonStateTypes/classesView/nestedClassID';
|
|
4
4
|
export interface ProfitAndLossClassesViewUIState {
|
|
5
5
|
classesToFilterOut: NestedClassID[];
|
|
6
6
|
nodeCollapseState: Record<ID, boolean>;
|
|
@@ -11,7 +11,7 @@ export interface ProfitAndLossClassesViewUIState {
|
|
|
11
11
|
} | undefined;
|
|
12
12
|
}
|
|
13
13
|
export interface ProfitAndLossClassesViewState extends Report {
|
|
14
|
-
|
|
14
|
+
classHierarchy: NestedClassHierarchyForReport[];
|
|
15
15
|
fetchState: {
|
|
16
16
|
month: FetchStateAndError;
|
|
17
17
|
quarter: FetchStateAndError;
|
|
@@ -7,7 +7,7 @@ const getNestedClassIDHierarchyForReport_1 = require("../../commonStateTypes/cla
|
|
|
7
7
|
const classPayload_1 = require("../../entity/class/classPayload");
|
|
8
8
|
const viewAndReportPayloadv2_1 = require("../../commonPayloadTypes/v2/viewAndReportPayloadv2");
|
|
9
9
|
exports.initialState = {
|
|
10
|
-
|
|
10
|
+
classHierarchy: [],
|
|
11
11
|
fetchState: {
|
|
12
12
|
month: {
|
|
13
13
|
fetchState: 'Not-Started',
|
|
@@ -116,7 +116,7 @@ const doUpdatedRevenueClassesView = (draft, timeframe, revenueReport) => {
|
|
|
116
116
|
draft.bookCloseDate = report.bookCloseDate;
|
|
117
117
|
draft.fetchState[timeframe].fetchState = 'Completed';
|
|
118
118
|
const classMetadata = revenueReport.report.classes.map((eachClass) => (0, classPayload_1.toClassMetadata)(eachClass));
|
|
119
|
-
if (draft.
|
|
120
|
-
draft.
|
|
119
|
+
if (draft.classHierarchy.length <= 0) {
|
|
120
|
+
draft.classHierarchy = (0, getNestedClassIDHierarchyForReport_1.geNestedClassIDHierarchyForReport)(classMetadata);
|
|
121
121
|
}
|
|
122
122
|
};
|
|
@@ -17,7 +17,7 @@ const getRevenueClassesView = (filter, accountState, classState, sectionsState,
|
|
|
17
17
|
const reportId = 'revenue_by_classes';
|
|
18
18
|
const sections = {};
|
|
19
19
|
const calculatedSections = {};
|
|
20
|
-
let
|
|
20
|
+
let classHierarchy = [];
|
|
21
21
|
let insights = [];
|
|
22
22
|
if (fetchState.fetchState === 'Completed') {
|
|
23
23
|
revenueClassesViewSelectorTypes_1.ALL_REVENUE_CLASSES_VIEW_SECTION_IDS.forEach((sectionId) => {
|
|
@@ -29,7 +29,7 @@ const getRevenueClassesView = (filter, accountState, classState, sectionsState,
|
|
|
29
29
|
const grossBurnBalancesByPeriod = sections['cogs'].sectionBalancesTotalByPeriod;
|
|
30
30
|
const grossProfitBalances = (0, getDifferenceOfBalancesGroupedByPeriod_1.getDifferenceOfBalancesGroupedByPeriod)(sections['income'].sectionBalancesTotalByPeriod, grossBurnBalancesByPeriod);
|
|
31
31
|
calculatedSections['grossMargin'] = (0, coaBalance_1.getCOABalances)(grossProfitBalances, filter);
|
|
32
|
-
|
|
32
|
+
classHierarchy = revenueClassesViewState.classHierarchy;
|
|
33
33
|
insights = revenueWithForecastState.revenue.insights;
|
|
34
34
|
}
|
|
35
35
|
return {
|
|
@@ -46,7 +46,7 @@ const getRevenueClassesView = (filter, accountState, classState, sectionsState,
|
|
|
46
46
|
error: fetchState.error,
|
|
47
47
|
filter: filter,
|
|
48
48
|
uiState: revenueClassesViewState.uiState,
|
|
49
|
-
|
|
49
|
+
classHierarchy,
|
|
50
50
|
classesToFilterOut: revenueClassesViewState.uiState.classesToFilterOut,
|
|
51
51
|
idsInOrder: exports.revenueIdsInOrder,
|
|
52
52
|
insights,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AccountViewMode, FetchStateAndError, ID } from '../../commonStateTypes/common';
|
|
2
2
|
import { Report } from '../../commonStateTypes/viewAndReport/viewAndReport';
|
|
3
|
-
import { NestedClassID,
|
|
3
|
+
import { NestedClassID, NestedClassHierarchyForReport } from '../../commonStateTypes/classesView/nestedClassID';
|
|
4
4
|
export interface RevenueClassesViewUIState {
|
|
5
5
|
classesToFilterOut: NestedClassID[];
|
|
6
6
|
nodeCollapseState: Record<ID, boolean>;
|
|
@@ -11,7 +11,7 @@ export interface RevenueClassesViewUIState {
|
|
|
11
11
|
} | undefined;
|
|
12
12
|
}
|
|
13
13
|
export interface RevenueClassesViewState extends Report {
|
|
14
|
-
|
|
14
|
+
classHierarchy: NestedClassHierarchyForReport[];
|
|
15
15
|
fetchState: {
|
|
16
16
|
month: FetchStateAndError;
|
|
17
17
|
quarter: FetchStateAndError;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { RootState } from '../../../reducer';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
|
|
3
|
+
import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
|
|
4
4
|
import { AccountBase } from '../../../entity/account/accountState';
|
|
5
5
|
import { ClassBase } from '../../../entity/class/classState';
|
|
6
6
|
import { JEScheduledTransaction } from '../../../entity/jeSchedules/jeSchedulesSelector';
|
|
@@ -13,11 +13,11 @@ export interface ScheduleDetailsView extends SelectorView {
|
|
|
13
13
|
scheduleType: ScheduleTypes;
|
|
14
14
|
allAccountList: AccountBase[];
|
|
15
15
|
uncategorizedAccounts: UncategorizedAccounts;
|
|
16
|
-
accountListNestedAccountHierarchy:
|
|
16
|
+
accountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
|
|
17
17
|
allClassList: ClassBase[];
|
|
18
|
-
classListNestedAccountHierarchy:
|
|
18
|
+
classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
|
|
19
19
|
allDepreciationAccountList: AccountBase[];
|
|
20
|
-
|
|
20
|
+
allDepreciationAccountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
|
|
21
21
|
uiState: ScheduleDetailUIState;
|
|
22
22
|
updateStatus: FetchStateAndError;
|
|
23
23
|
deleteStatus: FetchStateAndError;
|
|
@@ -29,7 +29,7 @@ const getScheduleDetailsView = (state, scheduleType) => {
|
|
|
29
29
|
uncategorizedAccounts,
|
|
30
30
|
accountListNestedAccountHierarchy: [],
|
|
31
31
|
classListNestedAccountHierarchy: [],
|
|
32
|
-
|
|
32
|
+
allDepreciationAccountListNestedAccountHierarchy: [],
|
|
33
33
|
scheduleDetailsLocalData: scheduleDetailReducer_1.initialScheduleDetailsLocalData,
|
|
34
34
|
fetchState: scheduleDetailState.fetchState,
|
|
35
35
|
error: scheduleDetailState.error,
|
|
@@ -54,12 +54,12 @@ const getScheduleDetailsView = (state, scheduleType) => {
|
|
|
54
54
|
const allClasses = allClassList.classes.map((classData) => {
|
|
55
55
|
return (0, omit_1.default)(classData, ['accountIds', 'key']);
|
|
56
56
|
});
|
|
57
|
-
const accountListNestedAccountHierarchy = (0, accountListSelector_1.
|
|
57
|
+
const accountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, accountTypes.accountListKey).filter((account) => account.accountId[0] != null &&
|
|
58
58
|
scheduleDetailAccountIds.includes(account.accountId[0]));
|
|
59
|
-
const depAccountListNestedAccountHierarchy = (0, accountListSelector_1.
|
|
59
|
+
const depAccountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, accountTypes.accountListKey).filter((account) => account.accountId[0] != null &&
|
|
60
60
|
depreciationCategoryIds.includes(account.accountId[0]) &&
|
|
61
61
|
!fixedAssetLabelAccountIds.includes(account.accountId[0]));
|
|
62
|
-
const classListNestedAccountHierarchy = (0, classListSelector_1.
|
|
62
|
+
const classListNestedAccountHierarchy = (0, classListSelector_1.getNestedClassListHierarchy)(classListState);
|
|
63
63
|
const selectedJeScheduleDetailId = jeScheduleTransactionState.jeScheduleId;
|
|
64
64
|
const scheduleDetailsLocalData = Object.assign({}, scheduleDetailReducer_1.initialScheduleDetailsLocalData);
|
|
65
65
|
if (selectedJeScheduleDetailId != null) {
|
|
@@ -84,7 +84,7 @@ const getScheduleDetailsView = (state, scheduleType) => {
|
|
|
84
84
|
allAccountList: filteredAccounts,
|
|
85
85
|
allClassList: allClasses,
|
|
86
86
|
allDepreciationAccountList: filteredDepAccounts,
|
|
87
|
-
|
|
87
|
+
allDepreciationAccountListNestedAccountHierarchy: depAccountListNestedAccountHierarchy,
|
|
88
88
|
uncategorizedAccounts,
|
|
89
89
|
accountListNestedAccountHierarchy,
|
|
90
90
|
classListNestedAccountHierarchy,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
|
|
2
2
|
import { Amount } from '../../../commonStateTypes/amount';
|
|
3
3
|
import { COABalance, COABalanceGroupedByPeriod } from '../../../commonStateTypes/coaBalance/coaBalance';
|
|
4
4
|
import { TimeframeTick, TimeframeTickWithMetaData } from '../../../commonStateTypes/timeframeTick';
|
|
@@ -23,7 +23,7 @@ export declare const getCalculatedScheduleTotals: (jeTransactions: JEScheduledTr
|
|
|
23
23
|
export declare const getAccountListKeyForSchedules: () => AccountListKeyType;
|
|
24
24
|
export declare const getAccountLabelForSchedulesTab: (tab: ScheduleTypes) => AccountLabel;
|
|
25
25
|
export declare const getAllAccountBase: () => AccountBase;
|
|
26
|
-
export declare const getAllAccountNested: () =>
|
|
26
|
+
export declare const getAllAccountNested: () => NestedAccountHierarchyForReport;
|
|
27
27
|
/**
|
|
28
28
|
* This helper function is to get all possible timeframe
|
|
29
29
|
* Logic --> Timeframe Range is startDate = (currentDate to 3 months back )and endDate = (currentDate to 9 months ahead)
|
|
@@ -3,7 +3,7 @@ import { EntityOrder } from '../../../commonStateTypes/selectorTypes/selectorTyp
|
|
|
3
3
|
import { SelectorView } from '../../../commonStateTypes/viewAndReport/viewAndReport';
|
|
4
4
|
import { RootState } from '../../../reducer';
|
|
5
5
|
import { ScheduleListLocalData, ScheduleListUIState } from './scheduleListState';
|
|
6
|
-
import {
|
|
6
|
+
import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
|
|
7
7
|
import { TimeframeTick, TimeframeTickWithMetaData } from '../../../commonStateTypes/timeframeTick';
|
|
8
8
|
import { AccountBase } from '../../../entity/account/accountState';
|
|
9
9
|
import { JEScheduledTransaction } from '../../../entity/jeSchedules/jeSchedulesSelector';
|
|
@@ -20,7 +20,7 @@ export interface ScheduleListReport extends SelectorView {
|
|
|
20
20
|
jeScheduleOrder: EntityOrder;
|
|
21
21
|
jeScheduledTransactions: JEScheduledTransactionWithBalance[];
|
|
22
22
|
scheduleListAccounts: AccountBase[];
|
|
23
|
-
scheduleListNestedAccountHierarchy:
|
|
23
|
+
scheduleListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
|
|
24
24
|
uiState: ScheduleListUIState;
|
|
25
25
|
selectedCategoryId: ID;
|
|
26
26
|
selectedTimeframe: TimeframeTick;
|