@zeniai/client-epic-state 5.2.95 → 5.2.97-beta0KB

package/lib/entity/genericEntity/entitySelector.d.ts

@@ -1,3 +1,5 @@
 import { ID } from '../../commonStateTypes/common';
+import { Entity } from './entity';
 import { EntityState } from './entityState';
-export declare function getEntityByEntityIDs(entityState: EntityState, entityIds: ID[]): import("./entity").Entity[];
+export declare function getEntityByEntityIDs(entityState: EntityState, entityIds: ID[]): Entity[];
+export declare function getEntityByEntityId(entityState: EntityState, entityId: ID): Entity | undefined;

package/lib/entity/genericEntity/entitySelector.js

@@ -1,8 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEntityByEntityIDs = getEntityByEntityIDs;
+exports.getEntityByEntityId = getEntityByEntityId;
+const get_1 = __importDefault(require("lodash/get"));
 function getEntityByEntityIDs(entityState, entityIds) {
     return entityIds.map((entityId) => {
         return entityState.entityById[entityId];
     });
 }
+function getEntityByEntityId(entityState, entityId) {
+    return (0, get_1.default)(entityState.entityById, entityId, undefined);
+}

package/lib/esm/entity/genericEntity/entitySelector.js

@@ -1,5 +1,9 @@
+import recordGet from 'lodash/get';
 export function getEntityByEntityIDs(entityState, entityIds) {
     return entityIds.map((entityId) => {
         return entityState.entityById[entityId];
     });
 }
+export function getEntityByEntityId(entityState, entityId) {
+    return recordGet(entityState.entityById, entityId, undefined);
+}

package/lib/esm/view/accountList/accountListReducer.js

@@ -28,6 +28,8 @@ export const initialState = {
         reimbursementAccountList: initialAccountList,
         schedulesAccountList: initialAccountList,
         billPayAccountList: initialAccountList,
+        createTransactionLineAccountList: initialAccountList,
+        createTransactionPaymentAccountList: initialAccountList,
     },
 };
 const accountList = createSlice({

package/lib/esm/view/transactionDetail/createTransaction/createTransactionPayload.js

@@ -1,6 +1,7 @@
 import { DEFAULT_DATE_FORMAT } from '../../../commonStateTypes/timePeriod';
 import { getAccountBaseForTransferAccounts } from '../../../entity/account/accountSelector';
 import { getClassById } from '../../../entity/class/classSelector';
+import { getEntityByEntityId } from '../../../entity/genericEntity/entitySelector';
 import { toProjectBasePayload, } from '../../../entity/project/projectPayload';
 import { getProjectById } from '../../../entity/project/projectSelector';
 import { getVendorByQboId, getVendorByVendorId, } from '../../../entity/vendor/vendorSelector';
@@ -93,10 +94,14 @@ const toSyncedVendorQboId = (vendor) => {
     }
     return vendor.qboId;
 };
-/** Resolves a Zeni vendor id to its QBO id -- `vendor_id` on the wire is a QBO id. */
+/**
+ * Resolves the picked vendor to its QBO id -- `vendor_id` on the wire is a QBO id. A vendor
+ * found by the server-side search is only in the entity store, keyed by its entity id.
+ */
 const toQboVendorId = (state, vendorId) => vendorId == null
     ? undefined
-    : toSyncedVendorQboId(getVendorByVendorId(state.vendorState, vendorId));
+    : toSyncedVendorQboId(getVendorByVendorId(state.vendorState, vendorId) ??
+        getEntityByEntityId(state.entityState, vendorId));
 /** A journal entry line holds the QBO id already, so it is only checked against the store. */
 const toQboLineVendorId = (state, vendorQboId) => vendorQboId == null
     ? undefined
@@ -142,6 +147,8 @@ export const prepareCreateTransactionPayload = (state, localData) => {
     if (transactionType === 'check') {
         return {
             ...purchaseBase,
+            // The form has no payment method field for a check; it is always paid by check.
+            payment_type: 'check',
             document_number: localData.documentNumber,
             print_status: localData.printStatus,
             remit_to_address: toRemitToAddressPayload(localData.remitToAddress),

package/lib/esm/view/transactionDetail/createTransaction/createTransactionSelector.js

@@ -1,5 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { getNestedAccountListHierarchy } from '../../accountList/accountListSelector';
+import { getAccountBase } from '../../../entity/account/accountSelector';
+import { getAccountListFetchState, getNestedAccountListHierarchy, } from '../../accountList/accountListSelector';
 import { getNestedClassListHierarchy } from '../../classList/classListSelector';
 import { getResolvedTransferAccounts } from '../../createTransferEntry/createTransferEntrySelector';
 import { getRecommendationsForEntity } from '../../recommendation/recommendationSelector';
@@ -22,6 +23,9 @@ export const getCreateTransactionVendorRecommendations = (state, vendorQboId) =>
         recommendations: view.recommendations,
     };
 };
+/** QBO keeps a sub-account on its parent's type, so filtering the roots is enough. */
+const getBankAccountsOnly = (accountState, hierarchy) => hierarchy.filter((node) => getAccountBase(accountState, node.accountId[0], 'account_list')
+    ?.accountType === 'bank');
 /**
  * Memoized: app-ui reads this straight from useSelector, and the vendor list and hierarchies are
  * rebuilt on every call, so an unmemoized version re-renders the page on every store action.
@@ -30,18 +34,28 @@ export const getCreateTransactionView = createSelector([
     (state) => state.transactionDetailState.createTransactionsState,
     (state) => state.vendorState.vendorByID,
     (state) => state.accountListState,
+    (state) => state.accountState,
     (state) => state.classListState,
     (state) => getResolvedTransferAccounts(state).transferAccountsList,
     (_state, transactionType) => transactionType,
-], (createTransactionsState, vendorByID, accountListState, classListState, transferAccountsList, transactionType) => ({
-    transactionType,
-    localData: createTransactionsState.newTransactionState[transactionType],
-    createStatus: createTransactionsState.createStatus,
-    createdTransactionId: createTransactionsState.createdTransactionId,
-    vendorList: Object.values(vendorByID),
-    accountListNestedAccountHierarchy: getNestedAccountListHierarchy(accountListState, 'accountList'),
-    classListNestedAccountHierarchy: getNestedClassListHierarchy(classListState),
-    transferAccountsList: transactionType === 'transfer' ? transferAccountsList : [],
-    fetchState: createTransactionsState.createStatus.fetchState,
-    error: createTransactionsState.createStatus.error,
-}));
+], (createTransactionsState, vendorByID, accountListState, accountState, classListState, transferAccountsList, transactionType) => {
+    const paymentAccountListNestedAccountHierarchy = getNestedAccountListHierarchy(accountListState, 'createTransactionPaymentAccountList');
+    return {
+        transactionType,
+        localData: createTransactionsState.newTransactionState[transactionType],
+        createStatus: createTransactionsState.createStatus,
+        createdTransactionId: createTransactionsState.createdTransactionId,
+        vendorList: Object.values(vendorByID),
+        accountListFetchState: getAccountListFetchState(accountListState, 'accountList'),
+        lineAccountListFetchState: getAccountListFetchState(accountListState, 'createTransactionLineAccountList'),
+        paymentAccountListFetchState: getAccountListFetchState(accountListState, 'createTransactionPaymentAccountList'),
+        accountListNestedAccountHierarchy: getNestedAccountListHierarchy(accountListState, 'createTransactionLineAccountList'),
+        paymentAccountListNestedAccountHierarchy: transactionType === 'check'
+            ? getBankAccountsOnly(accountState, paymentAccountListNestedAccountHierarchy)
+            : paymentAccountListNestedAccountHierarchy,
+        classListNestedAccountHierarchy: getNestedClassListHierarchy(classListState),
+        transferAccountsList: transactionType === 'transfer' ? transferAccountsList : [],
+        fetchState: createTransactionsState.createStatus.fetchState,
+        error: createTransactionsState.createStatus.error,
+    };
+});

package/lib/view/accountList/accountListReducer.js

@@ -35,6 +35,8 @@ exports.initialState = {
         reimbursementAccountList: exports.initialAccountList,
         schedulesAccountList: exports.initialAccountList,
         billPayAccountList: exports.initialAccountList,
+        createTransactionLineAccountList: exports.initialAccountList,
+        createTransactionPaymentAccountList: exports.initialAccountList,
     },
 };
 const accountList = (0, toolkit_1.createSlice)({

package/lib/view/accountList/accountListState.d.ts

@@ -1,7 +1,7 @@
 import { NestedAccountHierarchyForReport } from '../../commonStateTypes/accountView/nestedAccountID';
 import { FetchedState, ID } from '../../commonStateTypes/common';
 import { AccountLabel } from '../../entity/account/accountState';
-export type AccountListKeyType = 'accountList' | 'reimbursementAccountList' | 'schedulesAccountList' | 'billPayAccountList';
+export type AccountListKeyType = 'accountList' | 'reimbursementAccountList' | 'schedulesAccountList' | 'billPayAccountList' | 'createTransactionLineAccountList' | 'createTransactionPaymentAccountList';
 export interface AccountList extends FetchedState {
     accountIds: ID[];
     accountIdsByLabel: Record<AccountLabel, ID[]>;

package/lib/view/transactionDetail/createTransaction/createTransactionPayload.js

@@ -4,6 +4,7 @@ exports.prepareCreateTransactionPayload = exports.UnresolvedCreateTransactionIdE
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const accountSelector_1 = require("../../../entity/account/accountSelector");
 const classSelector_1 = require("../../../entity/class/classSelector");
+const entitySelector_1 = require("../../../entity/genericEntity/entitySelector");
 const projectPayload_1 = require("../../../entity/project/projectPayload");
 const projectSelector_1 = require("../../../entity/project/projectSelector");
 const vendorSelector_1 = require("../../../entity/vendor/vendorSelector");
@@ -97,10 +98,14 @@ const toSyncedVendorQboId = (vendor) => {
     }
     return vendor.qboId;
 };
-/** Resolves a Zeni vendor id to its QBO id -- `vendor_id` on the wire is a QBO id. */
+/**
+ * Resolves the picked vendor to its QBO id -- `vendor_id` on the wire is a QBO id. A vendor
+ * found by the server-side search is only in the entity store, keyed by its entity id.
+ */
 const toQboVendorId = (state, vendorId) => vendorId == null
     ? undefined
-    : toSyncedVendorQboId((0, vendorSelector_1.getVendorByVendorId)(state.vendorState, vendorId));
+    : toSyncedVendorQboId((0, vendorSelector_1.getVendorByVendorId)(state.vendorState, vendorId) ??
+        (0, entitySelector_1.getEntityByEntityId)(state.entityState, vendorId));
 /** A journal entry line holds the QBO id already, so it is only checked against the store. */
 const toQboLineVendorId = (state, vendorQboId) => vendorQboId == null
     ? undefined
@@ -146,6 +151,8 @@ const prepareCreateTransactionPayload = (state, localData) => {
     if (transactionType === 'check') {
         return {
             ...purchaseBase,
+            // The form has no payment method field for a check; it is always paid by check.
+            payment_type: 'check',
             document_number: localData.documentNumber,
             print_status: localData.printStatus,
             remit_to_address: toRemitToAddressPayload(localData.remitToAddress),

package/lib/view/transactionDetail/createTransaction/createTransactionSelector.d.ts

@@ -9,15 +9,24 @@ import { Vendor } from '../../../entity/vendor/vendorState';
 import { RootState } from '../../../rootStateTypes';
 import { CreatableTransactionType, CreateTransactionLocalData } from './createTransactionState';
 export interface CreateTransactionView extends SelectorView {
+    /** The shared COA; on this page it only backs the transfer From/To fallback. */
+    accountListFetchState: FetchState;
     /**
-     * COA and class trees for the header account and the line dropdowns. The hierarchies rather
-     * than flat lists, because the create page builds its grouped "Recommended" / "All" options
-     * with the same helpers the detail page uses.
+     * COA and class trees for the line dropdowns. The hierarchies rather than flat lists, because
+     * the create page builds its grouped "Recommended" / "All" options with the same helpers the
+     * detail page uses.
      */
     accountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     classListNestedAccountHierarchy: NestedClassHierarchyForReport[];
     createStatus: FetchStateAndError;
+    lineAccountListFetchState: FetchState;
     localData: CreateTransactionLocalData;
+    paymentAccountListFetchState: FetchState;
+    /**
+     * Bank, credit card and other current asset accounts for the header payment account; bank
+     * accounts only for a check.
+     */
+    paymentAccountListNestedAccountHierarchy: NestedAccountHierarchyForReport[];
     transactionType: CreatableTransactionType;
     /** Populated for transfer only; the COA would offer ineligible accounts. */
     transferAccountsList: AccountBase[];

package/lib/view/transactionDetail/createTransaction/createTransactionSelector.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCreateTransactionView = exports.getCreateTransactionVendorRecommendations = exports.getCreateTransactionStatus = exports.getCreateTransactionLocalData = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
+const accountSelector_1 = require("../../../entity/account/accountSelector");
 const accountListSelector_1 = require("../../accountList/accountListSelector");
 const classListSelector_1 = require("../../classList/classListSelector");
 const createTransferEntrySelector_1 = require("../../createTransferEntry/createTransferEntrySelector");
@@ -28,6 +29,9 @@ const getCreateTransactionVendorRecommendations = (state, vendorQboId) => {
     };
 };
 exports.getCreateTransactionVendorRecommendations = getCreateTransactionVendorRecommendations;
+/** QBO keeps a sub-account on its parent's type, so filtering the roots is enough. */
+const getBankAccountsOnly = (accountState, hierarchy) => hierarchy.filter((node) => (0, accountSelector_1.getAccountBase)(accountState, node.accountId[0], 'account_list')
+    ?.accountType === 'bank');
 /**
  * Memoized: app-ui reads this straight from useSelector, and the vendor list and hierarchies are
  * rebuilt on every call, so an unmemoized version re-renders the page on every store action.
@@ -36,18 +40,28 @@ exports.getCreateTransactionView = (0, toolkit_1.createSelector)([
     (state) => state.transactionDetailState.createTransactionsState,
     (state) => state.vendorState.vendorByID,
     (state) => state.accountListState,
+    (state) => state.accountState,
     (state) => state.classListState,
     (state) => (0, createTransferEntrySelector_1.getResolvedTransferAccounts)(state).transferAccountsList,
     (_state, transactionType) => transactionType,
-], (createTransactionsState, vendorByID, accountListState, classListState, transferAccountsList, transactionType) => ({
-    transactionType,
-    localData: createTransactionsState.newTransactionState[transactionType],
-    createStatus: createTransactionsState.createStatus,
-    createdTransactionId: createTransactionsState.createdTransactionId,
-    vendorList: Object.values(vendorByID),
-    accountListNestedAccountHierarchy: (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'accountList'),
-    classListNestedAccountHierarchy: (0, classListSelector_1.getNestedClassListHierarchy)(classListState),
-    transferAccountsList: transactionType === 'transfer' ? transferAccountsList : [],
-    fetchState: createTransactionsState.createStatus.fetchState,
-    error: createTransactionsState.createStatus.error,
-}));
+], (createTransactionsState, vendorByID, accountListState, accountState, classListState, transferAccountsList, transactionType) => {
+    const paymentAccountListNestedAccountHierarchy = (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'createTransactionPaymentAccountList');
+    return {
+        transactionType,
+        localData: createTransactionsState.newTransactionState[transactionType],
+        createStatus: createTransactionsState.createStatus,
+        createdTransactionId: createTransactionsState.createdTransactionId,
+        vendorList: Object.values(vendorByID),
+        accountListFetchState: (0, accountListSelector_1.getAccountListFetchState)(accountListState, 'accountList'),
+        lineAccountListFetchState: (0, accountListSelector_1.getAccountListFetchState)(accountListState, 'createTransactionLineAccountList'),
+        paymentAccountListFetchState: (0, accountListSelector_1.getAccountListFetchState)(accountListState, 'createTransactionPaymentAccountList'),
+        accountListNestedAccountHierarchy: (0, accountListSelector_1.getNestedAccountListHierarchy)(accountListState, 'createTransactionLineAccountList'),
+        paymentAccountListNestedAccountHierarchy: transactionType === 'check'
+            ? getBankAccountsOnly(accountState, paymentAccountListNestedAccountHierarchy)
+            : paymentAccountListNestedAccountHierarchy,
+        classListNestedAccountHierarchy: (0, classListSelector_1.getNestedClassListHierarchy)(classListState),
+        transferAccountsList: transactionType === 'transfer' ? transferAccountsList : [],
+        fetchState: createTransactionsState.createStatus.fetchState,
+        error: createTransactionsState.createStatus.error,
+    };
+});

package/package.json

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