@zeniai/client-epic-state 5.2.13 → 5.2.14-betaRD0

package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.d.ts

@@ -1,7 +1,7 @@
 import { NestedAccountHierarchyForReport } from '../../../commonStateTypes/accountView/nestedAccountID';
 import { NestedClassHierarchyForReport } from '../../../commonStateTypes/classesView/nestedClassID';
 import { FetchStateAndError } from '../../../commonStateTypes/common';
-import { AccountBase, AccountType } from '../../../entity/account/accountState';
+import { AccountBase } from '../../../entity/account/accountState';
 import { ClassBase } from '../../../entity/class/classState';
 import { RootState } from '../../../rootStateTypes';
 import { InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
@@ -16,11 +16,6 @@ export declare const isInvoicingQboConnected: (state: RootState) => boolean;
 export declare const isInvoicingAccountingPickerDataLoading: (state: RootState) => boolean;
 /** The QBO connection fetch on its own, without building the bundled view. */
 export declare const getInvoicingQboConnectionFetchState: (state: RootState) => FetchStateAndError;
-/**
- * Account types that can back invoicing revenue. Named here so screens ask for
- * "income accounts" rather than repeating the accounting service's vocabulary.
- */
-export declare const INVOICING_INCOME_ACCOUNT_TYPES: readonly AccountType[];
 /**
  * The account behind a picker value. The pickers submit the QuickBooks id, so
  * that is what callers hold; the payload builders need the whole entity to send
@@ -29,6 +24,18 @@ export declare const INVOICING_INCOME_ACCOUNT_TYPES: readonly AccountType[];
 export declare const invoicingQboAccountByQboId: (state: RootState, qboId: string | undefined) => AccountBase | undefined;
 /** The class behind a picker value, for the same reason as the account above. */
 export declare const invoicingQboClassByQboId: (state: RootState, qboId: string | undefined) => ClassBase | undefined;
+/**
+ * The resolver every catalog and settings payload builder needs: a picked
+ * QuickBooks id turned back into the account or class record the request body
+ * carries. Deliberately not memoized — epics call it once per action, where a
+ * fresh pair of closures costs nothing. Keep it out of `mapStateToProps`: the
+ * object identity changes per call, so a component reading it would re-render on
+ * every unrelated action.
+ */
+export declare const getInvoicingCatalogAccountingLookup: (state: RootState) => {
+    accountByQboId: (qboId: string) => AccountBase | undefined;
+    classByQboId: (qboId: string) => ClassBase | undefined;
+};
 /** An account or class as the invoicing pickers render and submit it. */
 export interface InvoicingAccountingOption {
     id: string;
@@ -60,13 +67,6 @@ export interface InvoicingQboView {
  * required would post a mapping QuickBooks rejects.
  */
 export declare const invoicingAccountsForQboAccountTypes: (accounts: InvoicingAccountingOption[], accountTypes: string) => InvoicingAccountingOption[];
-/**
- * The account tree narrowed to the given account types. The tree itself carries
- * no account type, so the flat account list supplies that and the matching
- * `qboId`s are kept — which is why callers that only need "income accounts, as a
- * tree" do not have to hold a second flat list to filter with.
- */
-export declare const invoicingAccountHierarchyForTypes: (state: RootState, accountTypes: readonly AccountType[]) => NestedAccountHierarchyForReport[];
 /**
  * Single bundled view for the QBO integration settings screen — the
  * connection, the account and class options, sync health, and the fetch/action

package/lib/view/invoicing/invoicingQboView/invoicingQboViewSelector.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingQboView = exports.invoicingAccountHierarchyForTypes = exports.invoicingAccountsForQboAccountTypes = exports.invoicingQboClassByQboId = exports.invoicingQboAccountByQboId = exports.INVOICING_INCOME_ACCOUNT_TYPES = exports.getInvoicingQboConnectionFetchState = exports.isInvoicingAccountingPickerDataLoading = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
+exports.getInvoicingQboView = exports.invoicingAccountsForQboAccountTypes = exports.getInvoicingCatalogAccountingLookup = exports.invoicingQboClassByQboId = exports.invoicingQboAccountByQboId = exports.getInvoicingQboConnectionFetchState = exports.isInvoicingAccountingPickerDataLoading = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
 // The shared bucket, fetched with the same arguments as the other consumers so
-// whichever screen loads first satisfies the rest. Invoicing narrows to income
-// accounts when it builds its options, so it does not need its own copy.
+// whichever screen loads first satisfies the rest. Invoicing renders the same
+// accounts they do, so it does not need its own copy.
 exports.INVOICING_ACCOUNT_LIST_KEY = 'accountList';
 /** Whether QBO is connected, without building the option lists to find out. */
 const isInvoicingQboConnected = (state) => state.invoicingQboViewState.connection?.connected === true;
@@ -35,14 +35,6 @@ exports.isInvoicingAccountingPickerDataLoading = isInvoicingAccountingPickerData
 /** The QBO connection fetch on its own, without building the bundled view. */
 const getInvoicingQboConnectionFetchState = (state) => state.invoicingQboViewState.connectionFetchState;
 exports.getInvoicingQboConnectionFetchState = getInvoicingQboConnectionFetchState;
-/**
- * Account types that can back invoicing revenue. Named here so screens ask for
- * "income accounts" rather than repeating the accounting service's vocabulary.
- */
-exports.INVOICING_INCOME_ACCOUNT_TYPES = [
-    'income',
-    'other_income',
-];
 /**
  * The account behind a picker value. The pickers submit the QuickBooks id, so
  * that is what callers hold; the payload builders need the whole entity to send
@@ -85,6 +77,19 @@ const invoicingQboClassByQboId = (state, qboId) => {
     }
 };
 exports.invoicingQboClassByQboId = invoicingQboClassByQboId;
+/**
+ * The resolver every catalog and settings payload builder needs: a picked
+ * QuickBooks id turned back into the account or class record the request body
+ * carries. Deliberately not memoized — epics call it once per action, where a
+ * fresh pair of closures costs nothing. Keep it out of `mapStateToProps`: the
+ * object identity changes per call, so a component reading it would re-render on
+ * every unrelated action.
+ */
+const getInvoicingCatalogAccountingLookup = (state) => ({
+    accountByQboId: (qboId) => (0, exports.invoicingQboAccountByQboId)(state, qboId),
+    classByQboId: (qboId) => (0, exports.invoicingQboClassByQboId)(state, qboId),
+});
+exports.getInvoicingCatalogAccountingLookup = getInvoicingCatalogAccountingLookup;
 /**
  * Accounts and classes as the invoicing pickers need them. Both come from the
  * shared accounting-service lists, so whatever another screen already loaded
@@ -92,17 +97,12 @@ exports.invoicingQboClassByQboId = invoicingQboClassByQboId;
  * API stores; an account without one cannot be posted, so it is dropped rather
  * than offered.
  */
-const invoicingAccountingOptions = (state, accountTypes) => {
+const invoicingAccountingOptions = (state) => {
     const { accounts } = (0, accountListSelector_1.getAccountList)(state.accountState, state.accountListState, exports.INVOICING_ACCOUNT_LIST_KEY);
     return accounts.flatMap((account) => {
         if (account.qboId == null || account.isDeleted === true) {
             return [];
         }
-        if (accountTypes != null &&
-            (account.accountType == null ||
-                !accountTypes.includes(account.accountType))) {
-            return [];
-        }
         return [
             {
                 id: String(account.qboId),
@@ -160,27 +160,6 @@ const invoicingAccountingClassOptions = (state) => {
             },
         ]);
 };
-/**
- * The account tree narrowed to the given account types. The tree itself carries
- * no account type, so the flat account list supplies that and the matching
- * `qboId`s are kept — which is why callers that only need "income accounts, as a
- * tree" do not have to hold a second flat list to filter with.
- */
-const invoicingAccountHierarchyForTypes = (state, accountTypes) => {
-    const allowedQboIds = new Set(invoicingAccountingOptions(state, accountTypes).map((account) => account.id));
-    const keepMatching = (nodes) => nodes.flatMap((node) => {
-        const children = keepMatching(node.children);
-        const isMatch = node.qboId != null && allowedQboIds.has(String(node.qboId));
-        // A parent that is not itself a match is still kept when it holds one, so
-        // the tree's shape survives the filter.
-        if (!isMatch && children.length === 0) {
-            return [];
-        }
-        return [{ ...node, children }];
-    });
-    return keepMatching((0, accountListSelector_1.getNestedAccountListHierarchy)(state.accountListState, exports.INVOICING_ACCOUNT_LIST_KEY));
-};
-exports.invoicingAccountHierarchyForTypes = invoicingAccountHierarchyForTypes;
 /**
  * Single bundled view for the QBO integration settings screen — the
  * connection, the account and class options, sync health, and the fetch/action

package/lib/view/scheduleView/scheduleListView/epics/fetchAccruedScheduleListEpic.js

@@ -33,7 +33,7 @@ const fetchAccruedScheduleListEpic = (actions$, state$, zeniAPI) => actions$.pip
         je_schedule_type: scheduleType,
         sort_by: 'transaction_date',
         sort_order: 'desc',
-        filter: 'all',
+        filter: action.payload.statusFilter,
     };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules?query=${encodeURIComponent(JSON.stringify(queryParam))}`)

package/lib/view/scheduleView/scheduleListView/epics/fetchDownloadSchedulesEpic.js

@@ -10,9 +10,14 @@ const responsePayload_1 = require("../../../../responsePayload");
 const scheduleListReducer_1 = require("../scheduleListReducer");
 const scheduleListTypes_1 = require("../scheduleListTypes");
 const fetchDownloadSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(scheduleListReducer_1.fetchDownloadSchedules.match), (0, operators_1.mergeMap)((action) => {
-    const { scheduleType, downloadCategories } = action.payload;
+    const { scheduleType, downloadCategories, statusFilter } = action.payload;
     const scheduleListState = state$.value.scheduleListState;
     // if parameters are provided, use those. else go to localdata
+    // Accrued is deliberately not served here. Its rows come back in a different shape, this
+    // epic writes them through updateJESchedules (the prepaid / fixed mapper), and
+    // doUpdateScheduleList never flips downloadState for accrued -- so a request would store the
+    // wrong data and then never report completion. Accrued downloads go through
+    // fetchAccruedScheduleList, which owns that shape end to end.
     let scheduleState;
     if (scheduleType !== 'accrued_expenses') {
         scheduleState = (0, scheduleListReducer_1.getState)(scheduleListState, scheduleType);
@@ -37,7 +42,7 @@ const fetchDownloadSchedulesEpic = (actions$, state$, zeniAPI) => actions$.pipe(
         base_txn_account_ids: downloadCategories,
         sort_by: 'transaction_date',
         sort_order: 'desc',
-        filter: 'all',
+        filter: statusFilter,
     };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/schedules/download?query=${encodeURIComponent(JSON.stringify(queryParam))}`)

package/lib/view/scheduleView/scheduleListView/scheduleListReducer.d.ts

@@ -16,7 +16,7 @@ export declare const initialState: ScheduleListViewState;
 export declare const fetchDownloadSchedules: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory: {
     selectedCategoryId: ID;
     selectedTimeframe: TimeframeTick;
-}, downloadCategories: string[], cacheOverride?: any], {
+}, downloadCategories: string[], statusFilter?: "completed" | "new" | "ongoing" | "all" | undefined, cacheOverride?: any], {
     timeframeAndCategory: {
         selectedCategoryId: ID;
         selectedTimeframe: TimeframeTick;
@@ -24,16 +24,18 @@ export declare const fetchDownloadSchedules: import("@reduxjs/toolkit").ActionCr
     scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     cacheOverride: any;
     downloadCategories: string[];
+    statusFilter: "completed" | "new" | "ongoing" | "all";
 }, "scheduleListView/fetchDownloadSchedules", never, never>, fetchAccruedScheduleList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory?: {
     selectedCategoryId: ID;
     selectedTimeframe: TimeframeTick;
-} | undefined, cacheOverride?: any], {
+} | undefined, cacheOverride?: any, statusFilter?: "completed" | "new" | "ongoing" | "all" | undefined], {
     timeframeAndCategory: {
         selectedCategoryId: ID;
         selectedTimeframe: TimeframeTick;
     } | undefined;
     scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue";
     cacheOverride: any;
+    statusFilter: "completed" | "new" | "ongoing" | "all";
 }, "scheduleListView/fetchAccruedScheduleList", never, never>, fetchScheduleList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[scheduleType: "prepaid_expenses" | "fixed_assets" | "accrued_expenses" | "deferred_revenue", timeframeAndCategory?: {
     selectedCategoryId: ID;
     selectedTimeframe: TimeframeTick;

package/lib/view/scheduleView/scheduleListView/scheduleListReducer.js

@@ -90,8 +90,8 @@ const scheduleListView = (0, toolkit_1.createSlice)({
     reducers: {
         fetchDownloadSchedules: {
             reducer(draft, action) {
+                // Accrued is not downloaded through this action -- see fetchDownloadSchedulesEpic for why.
                 if (action.payload.scheduleType !== 'accrued_expenses') {
-                    //if condition added for type narrowing
                     const state = getState(draft, action.payload.scheduleType);
                     const selectedTimeframe = action.payload.timeframeAndCategory.selectedTimeframe;
                     const selectedCategoryId = action.payload.timeframeAndCategory.selectedCategoryId;
@@ -115,13 +115,14 @@ const scheduleListView = (0, toolkit_1.createSlice)({
                     updateState(draft, action.payload.scheduleType, state);
                 }
             },
-            prepare(scheduleType, timeframeAndCategory, downloadCategories, cacheOverride = false) {
+            prepare(scheduleType, timeframeAndCategory, downloadCategories, statusFilter = 'all', cacheOverride = false) {
                 return {
                     payload: {
                         timeframeAndCategory,
                         scheduleType,
                         cacheOverride,
                         downloadCategories,
+                        statusFilter,
                     },
                 };
             },
@@ -157,12 +158,13 @@ const scheduleListView = (0, toolkit_1.createSlice)({
                     updateState(draft, action.payload.scheduleType, state);
                 }
             },
-            prepare(scheduleType, timeframeAndCategory, cacheOverride = false) {
+            prepare(scheduleType, timeframeAndCategory, cacheOverride = false, statusFilter = 'all') {
                 return {
                     payload: {
                         timeframeAndCategory,
                         scheduleType,
                         cacheOverride,
+                        statusFilter,
                     },
                 };
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.2.13",
+  "version": "5.2.14-betaRD0",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",