@zeniai/client-epic-state 5.2.4 → 5.2.6

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

@@ -1,19 +1,140 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInvoicingQboView = void 0;
+exports.getInvoicingQboView = exports.invoicingAccountHierarchyForTypes = exports.invoicingAccountsForQboAccountTypes = exports.INVOICING_INCOME_ACCOUNT_TYPES = exports.isInvoicingQboConnected = exports.INVOICING_ACCOUNT_LIST_KEY = void 0;
+const accountListSelector_1 = require("../../accountList/accountListSelector");
+const classListSelector_1 = require("../../classList/classListSelector");
+// Its own bucket: invoicing needs the AP/AR exclusions that the vendor and
+// transaction screens sharing `accountList` do not pass.
+exports.INVOICING_ACCOUNT_LIST_KEY = 'invoicingAccountList';
+/** Whether QBO is connected, without building the option lists to find out. */
+const isInvoicingQboConnected = (state) => state.invoicingQboViewState.connection?.connected === true;
+exports.isInvoicingQboConnected = isInvoicingQboConnected;
+/**
+ * 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',
+];
+/**
+ * Accounts and classes as the invoicing pickers need them. Both come from the
+ * shared accounting-service lists, so whatever another screen already loaded
+ * is reused. `qboId` is the submitted value because that is what the invoicing
+ * API stores; an account without one cannot be posted, so it is dropped rather
+ * than offered.
+ */
+const invoicingAccountingOptions = (state, accountTypes) => {
+    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),
+                name: account.accountName,
+                accountType: account.accountType,
+            },
+        ];
+    });
+};
+/**
+ * Normalises an account-type name for comparison. The config's mapping kinds
+ * name QuickBooks types the way QuickBooks displays them ("Other Current
+ * Asset", "Expense"), while the accounting service uses snake_case and
+ * sometimes pluralises ("other_current_assets", "expenses"). Comparing the
+ * normalised, de-pluralised forms keeps a picker from silently emptying because
+ * of a trailing "s".
+ */
+const normalizeAccountTypeName = (value) => {
+    const normalized = value
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, '_');
+    // Singularise so "Other Current Liability" meets `other_current_liabilities`
+    // and "Expense" meets `expenses`. `-ies` needs its own case: stripping the
+    // trailing "s" alone would leave "liabilitie", matching nothing.
+    return normalized.replace(/ies$/, 'y').replace(/([^s])s$/, '$1');
+};
+/**
+ * The accounts valid for one QBO mapping kind, whose `accountTypes` is a
+ * comma-separated list of QuickBooks type names. An unrecognised list yields no
+ * accounts rather than every account: offering a bank account where income is
+ * required would post a mapping QuickBooks rejects.
+ */
+const invoicingAccountsForQboAccountTypes = (accounts, accountTypes) => {
+    const wanted = new Set(accountTypes
+        .split(',')
+        .map(normalizeAccountTypeName)
+        .filter((accountType) => accountType !== ''));
+    if (wanted.size === 0) {
+        return accounts;
+    }
+    return accounts.filter((account) => account.accountType != null &&
+        wanted.has(normalizeAccountTypeName(account.accountType)));
+};
+exports.invoicingAccountsForQboAccountTypes = invoicingAccountsForQboAccountTypes;
+/** Classes as the invoicing pickers need them, from the shared class list. */
+const invoicingAccountingClassOptions = (state) => {
+    const { classes } = (0, classListSelector_1.getClassList)(state.classState, state.classListState);
+    return classes.flatMap((accountingClass) => accountingClass.qboId == null || accountingClass.isDeleted === true
+        ? []
+        : [
+            {
+                id: String(accountingClass.qboId),
+                name: accountingClass.className,
+            },
+        ]);
+};
+/**
+ * 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, per-account-types account options, classes, sync health, and the
- * fetch/action states for each of them.
+ * connection, the account and class options, sync health, and the fetch/action
+ * states for each of them.
  */
 const getInvoicingQboView = (state) => {
     const qboState = state.invoicingQboViewState;
+    const accountList = state.accountListState.byReportId[exports.INVOICING_ACCOUNT_LIST_KEY];
     return {
-        accountsByAccountTypes: qboState.accountsByAccountTypes,
-        accountsFetchStateByAccountTypes: qboState.accountsFetchStateByAccountTypes,
+        accounts: invoicingAccountingOptions(state),
+        accountsFetchState: {
+            fetchState: accountList.fetchState,
+            error: accountList.error,
+        },
+        nestedAccountHierarchy: (0, accountListSelector_1.getNestedAccountListHierarchy)(state.accountListState, exports.INVOICING_ACCOUNT_LIST_KEY),
+        nestedClassHierarchy: (0, classListSelector_1.getNestedClassListHierarchy)(state.classListState),
         backfillState: qboState.backfillFetchState,
-        classes: qboState.classes,
-        classesFetchState: qboState.classesFetchState,
+        classes: invoicingAccountingClassOptions(state),
+        classesFetchState: {
+            fetchState: state.classListState.fetchState,
+            error: state.classListState.error,
+        },
         connection: qboState.connection,
         connectionFetchState: qboState.connectionFetchState,
         retryFetchStateByTaskId: qboState.retryFetchStateByTaskId,

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

@@ -1,11 +1,7 @@
 import { FetchStateAndError } from '../../../commonStateTypes/common';
-import { InvoicingQboAccountOption, InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
+import { InvoicingQboConnection, InvoicingQboSyncHealth } from './invoicingQboViewPayload';
 export interface InvoicingQboViewState {
-    accountsByAccountTypes: Record<string, InvoicingQboAccountOption[]>;
-    accountsFetchStateByAccountTypes: Record<string, FetchStateAndError>;
     backfillFetchState: FetchStateAndError;
-    classes: InvoicingQboAccountOption[];
-    classesFetchState: FetchStateAndError;
     connectionFetchState: FetchStateAndError;
     retryFetchStateByTaskId: Record<string, FetchStateAndError>;
     syncHealthFetchState: FetchStateAndError;

package/lib/view/taskManager/taskListView/taskList.d.ts

@@ -58,7 +58,7 @@ export interface TaskListUIState extends SpendManagementUIState {
     searchText: string;
     sortKey: TaskListViewSortKey;
 }
-declare const toTaskListSortKeyType: (v: string) => "status" | "dueDate" | "name" | "priority" | "assignee" | "creationDate" | "tag" | "timeSpent" | "visibility";
+declare const toTaskListSortKeyType: (v: string) => "status" | "dueDate" | "name" | "priority" | "assignee" | "creationDate" | "tag" | "visibility" | "timeSpent";
 export declare type TaskListViewSortKey = ReturnType<typeof toTaskListSortKeyType>;
 export declare const TASK_LIST_FILTER_CATEGORIES: TaskListFilterCategoryOption[];
 interface TaskListFilterCategoryOption {

package/package.json

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

package/lib/esm/view/invoicing/invoicingQboView/epics/fetchInvoicingQboAccountsEpic.js

@@ -1,25 +0,0 @@
-import { of } from 'rxjs';
-import { catchError, filter, map, mergeMap } from 'rxjs/operators';
-import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { mapInvoicingQboAccountOptions, } from '../invoicingQboViewPayload';
-import { fetchInvoicingQboAccounts, updateInvoicingQboAccounts, updateInvoicingQboAccountsFailure, } from '../invoicingQboViewReducer';
-export const fetchInvoicingQboAccountsEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingQboAccounts.match), mergeMap((action) => {
-    const { accountTypes } = action.payload;
-    const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/qbo/accounts?account_types=${encodeURIComponent(accountTypes)}`;
-    return zeniAPI.getJSON(apiUrl).pipe(map((response) => {
-        if (isSuccessResponse(response)) {
-            return updateInvoicingQboAccounts({
-                accountTypes,
-                accounts: mapInvoicingQboAccountOptions(response.data?.accounts ?? []),
-            });
-        }
-        return updateInvoicingQboAccountsFailure({
-            accountTypes,
-            status: response.status,
-        });
-    }), catchError((error) => of(updateInvoicingQboAccountsFailure({
-        accountTypes,
-        status: createZeniAPIStatus('Unexpected Error', 'Fetch QBO accounts REST API call errored out ' +
-            JSON.stringify(error)),
-    }))));
-}));

package/lib/esm/view/invoicing/invoicingQboView/epics/fetchInvoicingQboClassesEpic.js

@@ -1,15 +0,0 @@
-import { of } from 'rxjs';
-import { catchError, filter, map, switchMap } from 'rxjs/operators';
-import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
-import { mapInvoicingQboAccountOptions, } from '../invoicingQboViewPayload';
-import { fetchInvoicingQboClasses, updateInvoicingQboClasses, updateInvoicingQboClassesFailure, } from '../invoicingQboViewReducer';
-export const fetchInvoicingQboClassesEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInvoicingQboClasses.match), switchMap(() => {
-    const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/qbo/classes`;
-    return zeniAPI.getJSON(apiUrl).pipe(map((response) => {
-        if (isSuccessResponse(response)) {
-            return updateInvoicingQboClasses(mapInvoicingQboAccountOptions(response.data?.accounts ?? []));
-        }
-        return updateInvoicingQboClassesFailure(response.status);
-    }), catchError((error) => of(updateInvoicingQboClassesFailure(createZeniAPIStatus('Unexpected Error', 'Fetch QBO classes REST API call errored out ' +
-        JSON.stringify(error))))));
-}));

package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingQboAccountsEpic.d.ts

@@ -1,6 +0,0 @@
-import { ActionsObservable, StateObservable } from 'redux-observable';
-import { Observable } from 'rxjs';
-import { RootState } from '../../../../rootStateTypes';
-import { ZeniAPI } from '../../../../zeniAPI';
-import { InvoicingQboViewActionType } from './invoicingQboViewActionType';
-export declare const fetchInvoicingQboAccountsEpic: (actions$: ActionsObservable<InvoicingQboViewActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<InvoicingQboViewActionType>;

package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingQboAccountsEpic.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchInvoicingQboAccountsEpic = void 0;
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const responsePayload_1 = require("../../../../responsePayload");
-const invoicingQboViewPayload_1 = require("../invoicingQboViewPayload");
-const invoicingQboViewReducer_1 = require("../invoicingQboViewReducer");
-const fetchInvoicingQboAccountsEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(invoicingQboViewReducer_1.fetchInvoicingQboAccounts.match), (0, operators_1.mergeMap)((action) => {
-    const { accountTypes } = action.payload;
-    const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/qbo/accounts?account_types=${encodeURIComponent(accountTypes)}`;
-    return zeniAPI.getJSON(apiUrl).pipe((0, operators_1.map)((response) => {
-        if ((0, responsePayload_1.isSuccessResponse)(response)) {
-            return (0, invoicingQboViewReducer_1.updateInvoicingQboAccounts)({
-                accountTypes,
-                accounts: (0, invoicingQboViewPayload_1.mapInvoicingQboAccountOptions)(response.data?.accounts ?? []),
-            });
-        }
-        return (0, invoicingQboViewReducer_1.updateInvoicingQboAccountsFailure)({
-            accountTypes,
-            status: response.status,
-        });
-    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, invoicingQboViewReducer_1.updateInvoicingQboAccountsFailure)({
-        accountTypes,
-        status: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch QBO accounts REST API call errored out ' +
-            JSON.stringify(error)),
-    }))));
-}));
-exports.fetchInvoicingQboAccountsEpic = fetchInvoicingQboAccountsEpic;

package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingQboClassesEpic.d.ts

@@ -1,6 +0,0 @@
-import { ActionsObservable, StateObservable } from 'redux-observable';
-import { Observable } from 'rxjs';
-import { RootState } from '../../../../rootStateTypes';
-import { ZeniAPI } from '../../../../zeniAPI';
-import { InvoicingQboViewActionType } from './invoicingQboViewActionType';
-export declare const fetchInvoicingQboClassesEpic: (actions$: ActionsObservable<InvoicingQboViewActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<InvoicingQboViewActionType>;

package/lib/view/invoicing/invoicingQboView/epics/fetchInvoicingQboClassesEpic.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchInvoicingQboClassesEpic = void 0;
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
-const responsePayload_1 = require("../../../../responsePayload");
-const invoicingQboViewPayload_1 = require("../invoicingQboViewPayload");
-const invoicingQboViewReducer_1 = require("../invoicingQboViewReducer");
-const fetchInvoicingQboClassesEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(invoicingQboViewReducer_1.fetchInvoicingQboClasses.match), (0, operators_1.switchMap)(() => {
-    const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/qbo/classes`;
-    return zeniAPI.getJSON(apiUrl).pipe((0, operators_1.map)((response) => {
-        if ((0, responsePayload_1.isSuccessResponse)(response)) {
-            return (0, invoicingQboViewReducer_1.updateInvoicingQboClasses)((0, invoicingQboViewPayload_1.mapInvoicingQboAccountOptions)(response.data?.accounts ?? []));
-        }
-        return (0, invoicingQboViewReducer_1.updateInvoicingQboClassesFailure)(response.status);
-    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, invoicingQboViewReducer_1.updateInvoicingQboClassesFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Fetch QBO classes REST API call errored out ' +
-        JSON.stringify(error))))));
-}));
-exports.fetchInvoicingQboClassesEpic = fetchInvoicingQboClassesEpic;