@zeniai/client-epic-state 5.1.82 → 5.1.83-betaRD1

package/lib/esm/view/expenseAutomationView/selectors/jeSchedulesViewSelector.js

@@ -3,7 +3,8 @@ import orderBy from 'lodash/orderBy';
 import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
 import { LAST_SCHEDULE_DAY_OF_MONTH, toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
 import { getAccountIdsForTypes } from '../../../entity/account/accountSelector';
-import { getJEScheduledTransactionByJEScheduleTransactionKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
+import { getJEAccruedScheduleByJEScheduleKey, getJEScheduledTransactionByJEScheduleTransactionKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
+import { ALL_SCHEDULES_TYPES, } from '../../../entity/jeSchedules/jeSchedulesTypes';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
 import { getAccountIdsForLabel, getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts, } from '../../accountList/accountListSelector';
 import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
@@ -11,7 +12,38 @@ import { getAccountsTypesForScheduleDetails } from '../../scheduleView/scheduleD
 import { filterNestedAccountHierarchyById } from '../../scheduleView/scheduleDetailView/scheduleDetailSelector';
 import { getAccountLabelForScheduleType, getAccountsTypesForScheduleList, } from '../../scheduleView/scheduleListView/scheduleListHelper';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
+import { ALL_JE_PAGE_TABS, getJESchedulePeriodTabKey, } from '../types/jeSchedulesViewState';
 import { getJEAccountSettingsView } from './jeAccountSettingsViewSelector';
+import { getNewScheduleView } from './jeNewScheduleViewSelector';
+// Matches the AI-automation user addresses webc's schedule list row already
+// checks (JEScheduleReadOnlyListRow/JEScheduleDraftListRow "Method" column,
+// strings.ts aiBotEmail/botEmail) to determine whether a schedule was
+// created by the AI accountant vs. a human.
+const AI_BOT_EMAIL = 'ai@zeni.ai';
+const BOT_EMAIL = 'bot@zeni.ai';
+// Exported (rather than kept as a closure inside the selector) so it can be
+// unit-tested directly — confidenceScore is a separate, more narrowly
+// populated field that can be null on a schedule the bot user created,
+// which previously caused these schedules to display as "AI Accountant" in
+// the list but count under "Manual" in the KPI summary.
+export const isAiAccountantSchedule = (schedule) => schedule.createdByUser?.email === AI_BOT_EMAIL ||
+    schedule.createdByUser?.email === BOT_EMAIL;
+// Accrued schedules are structurally distinct — no baseTransaction, carrying recurringAmount and
+// memo in its place — so anything reading baseTransaction has to branch on this first.
+//
+// Discriminates on jeAccruedScheduleKey, which only JEAccruedSchedule carries. jeScheduleType
+// cannot be used: it is a data field present on BOTH row shapes, so an accrued-typed row that
+// arrived through the prepaid/fixed DTO (failed_je_postings, legacy fetches) would be
+// misclassified and then crash on recurringAmount / jeAccruedScheduleKey.
+export function isAccruedScheduleRow(schedule) {
+    return 'jeAccruedScheduleKey' in schedule;
+}
+function getScheduleAmount(schedule) {
+    if (isAccruedScheduleRow(schedule)) {
+        return schedule.recurringAmount.amount;
+    }
+    return schedule.baseTransaction.amount.amount;
+}
 function getJEScheduleSortAccessor(sortKey) {
     switch (sortKey) {
         case 'vendor':
@@ -23,7 +55,9 @@ function getJEScheduleSortAccessor(sortKey) {
         case 'depCategory':
             return (s) => s.jeCredit.account?.accountName?.toLowerCase();
         case 'scheduleCategory':
-            return (s) => s.baseTransaction.account?.accountName?.toLowerCase();
+            return (s) => isAccruedScheduleRow(s)
+                ? undefined
+                : s.baseTransaction.account?.accountName?.toLowerCase();
         case 'startMonth':
             return (s) => s.startDate?.valueOf();
         case 'type':
@@ -51,11 +85,13 @@ function getJEScheduleSortAccessor(sortKey) {
                 return s.balanceAsOfToday?.amount ?? null;
             };
         case 'totalAmount':
-            return (s) => s.baseTransaction.amount.amount;
+            return (s) => getScheduleAmount(s);
         case 'transactionDate':
-            return (s) => s.baseTransaction.date.valueOf();
+            return (s) => s.createTime?.valueOf();
         case 'memo':
-            return (s) => s.baseTransaction.memo?.toLowerCase();
+            return (s) => isAccruedScheduleRow(s)
+                ? s.memo.toLowerCase()
+                : s.baseTransaction.memo?.toLowerCase();
         default:
             return (s) => s.startDate?.valueOf();
     }
@@ -67,9 +103,14 @@ function sortJEScheduledTransactions(transactions, sortKey, sortOrder) {
 export function getExpenseAutomationJESchedulesView(state) {
     const jeScheduledTransaction = [];
     const failedJeScheduledTransaction = [];
+    const accruedSchedules = [];
     const { accountState, accountListState, classState, classListState, expenseAutomationJESchedulesViewState, expenseAutomationViewState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
-    const { jeScheduleTransactionKeysByPeriod, failedJeScheduleTransactionKeysByPeriod, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, } = expenseAutomationJESchedulesViewState;
+    const { jeScheduleTransactionKeysByPeriodAndTab, jeScheduleAccruedKeysByPeriodAndTab, failedJeScheduleTransactionKeysByPeriodAndTab, jeScheduleLocalDataById, postStatusById, ignoreStatusById, uiState, error, fetchState, refreshStatus, newSchedule, } = expenseAutomationJESchedulesViewState;
     const accountSettingsView = getJEAccountSettingsView(state);
+    const newScheduleView = newSchedule.selectedDetailScheduleType === 'fixed_assets' ||
+        newSchedule.selectedDetailScheduleType === 'prepaid_expenses'
+        ? getNewScheduleView(state, newSchedule.selectedDetailScheduleType)
+        : undefined;
     const currentTenant = getCurrentTenant(state);
     const { selectedPeriodByTenantId } = expenseAutomationViewState;
     const selectedPeriod = selectedPeriodByTenantId[currentTenant.tenantId];
@@ -97,27 +138,39 @@ export function getExpenseAutomationJESchedulesView(state) {
     const filteredDepAccountListNestedAccountHierarchy = filterNestedAccountHierarchyById(depAccountListNestedAccountHierarchy, filteredDepAccounts.map((account) => account.accountId));
     const classListNestedAccountHierarchy = getNestedClassListHierarchy(classListState);
     const monthYearPeriodId = selectedPeriod != null ? toMonthYearPeriodId(selectedPeriod) : null;
-    const jeScheduleTransactionKeysForSelectedPeriod = monthYearPeriodId != null
-        ? jeScheduleTransactionKeysByPeriod[monthYearPeriodId]
+    const selectedPeriodTabKey = monthYearPeriodId != null
+        ? getJESchedulePeriodTabKey(uiState.selectedPageTab, monthYearPeriodId)
         : null;
-    const failedJeScheduleTransactionKeysForSelectedPeriod = monthYearPeriodId != null
-        ? failedJeScheduleTransactionKeysByPeriod[monthYearPeriodId]
-        : null;
-    const jeScheduleTransactionKeys = jeScheduleTransactionKeysForSelectedPeriod ?? [];
-    const failedJeScheduleTransactionKeys = failedJeScheduleTransactionKeysForSelectedPeriod ?? [];
+    const jeScheduleTransactionKeysForSelectedTab = selectedPeriodTabKey != null
+        ? jeScheduleTransactionKeysByPeriodAndTab[selectedPeriodTabKey]
+        : undefined;
+    const failedJeScheduleTransactionKeysForSelectedTab = selectedPeriodTabKey != null
+        ? failedJeScheduleTransactionKeysByPeriodAndTab[selectedPeriodTabKey]
+        : undefined;
+    // Distinguishes "this tab has never been fetched for this period" from "fetched and genuinely
+    // empty". Without it the page cannot tell a first visit from a real empty state, and renders an
+    // empty table where it should render a skeleton.
+    const hasLoadedForSelectedTab = jeScheduleTransactionKeysForSelectedTab != null;
+    const jeScheduleTransactionKeys = jeScheduleTransactionKeysForSelectedTab ?? [];
+    const failedJeScheduleTransactionKeys = failedJeScheduleTransactionKeysForSelectedTab ?? [];
+    const jeScheduleAccruedKeys = (selectedPeriodTabKey != null
+        ? jeScheduleAccruedKeysByPeriodAndTab[selectedPeriodTabKey]
+        : undefined) ?? [];
     jeScheduleTransactionKeys.forEach((jeScheduleKey) => {
         const jeScheduleDetails = getJEScheduledTransactionByJEScheduleTransactionKey(jeScheduleKey, state);
         jeScheduledTransaction.push(jeScheduleDetails);
     });
+    jeScheduleAccruedKeys.forEach((jeAccruedScheduleKey) => {
+        const accruedScheduleDetails = getJEAccruedScheduleByJEScheduleKey(jeAccruedScheduleKey, state);
+        if (accruedScheduleDetails != null) {
+            accruedSchedules.push(accruedScheduleDetails);
+        }
+    });
     failedJeScheduleTransactionKeys.forEach((jeScheduleKey) => {
         const jeScheduleDetails = getJEScheduledTransactionByJEScheduleTransactionKey(jeScheduleKey, state);
         failedJeScheduledTransaction.push(jeScheduleDetails);
     });
-    const { sortKey, sortOrder } = uiState;
-    const draftSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'), sortKey, sortOrder);
-    const ongoingSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'ongoing'), sortKey, sortOrder);
-    const completedSchedules = sortJEScheduledTransactions(jeScheduledTransaction.filter((schedule) => schedule.status.code === 'completed' ||
-        schedule.status.code === 'marked_as_completed'), sortKey, sortOrder);
+    const { sortKey, sortOrder, selectedJETypeFilter } = uiState;
     const unsortedResolveSchedules = [];
     failedJeScheduledTransaction.forEach((schedule) => {
         schedule.scheduledJournalEntry.forEach((journalEntry) => {
@@ -129,10 +182,73 @@ export function getExpenseAutomationJESchedulesView(state) {
     });
     const resolveSchedules = sortJEScheduledTransactions(unsortedResolveSchedules, sortKey, sortOrder);
     const validResolveForPending = unsortedResolveSchedules.filter((r) => jeScheduleLocalDataById[r.scheduledJournalEntry.scheduledJournalEntryID] != null);
+    const matchesTypeFilter = (schedule) => selectedJETypeFilter == null ||
+        schedule.jeScheduleType === selectedJETypeFilter;
+    const isCreatedStatus = (schedule) => schedule.status.code === 'ongoing' ||
+        schedule.status.code === 'completed' ||
+        schedule.status.code === 'marked_as_completed';
+    const allScheduleRows = [
+        ...jeScheduledTransaction,
+        ...accruedSchedules,
+    ];
     const pendingReviewSchedules = sortJEScheduledTransactions([
-        ...jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'),
+        ...allScheduleRows.filter((schedule) => schedule.status.code === 'draft' && matchesTypeFilter(schedule)),
         ...validResolveForPending,
     ], sortKey, sortOrder);
+    const createdSchedules = sortJEScheduledTransactions(allScheduleRows.filter((schedule) => isCreatedStatus(schedule) && matchesTypeFilter(schedule)), sortKey, sortOrder);
+    // KPI summary — derived from unfiltered schedules so counts are always accurate
+    const allSchedules = allScheduleRows;
+    const sumAmount = (schedules) => schedules.reduce((total, schedule) => total + (getScheduleAmount(schedule) ?? 0), 0);
+    const pendingReviewTotal = sumAmount(pendingReviewSchedules);
+    const createdTotal = sumAmount(createdSchedules);
+    const aiAccountantSchedules = allSchedules.filter(isAiAccountantSchedule);
+    const manualSchedules = allSchedules.filter((schedule) => !isAiAccountantSchedule(schedule));
+    const pendingUnfiltered = allSchedules.filter((schedule) => schedule.status.code === 'draft');
+    const kpiSummary = {
+        aiAccountant: {
+            count: aiAccountantSchedules.length,
+            amount: sumAmount(aiAccountantSchedules),
+        },
+        manual: {
+            count: manualSchedules.length,
+            amount: sumAmount(manualSchedules),
+        },
+        needsReview: {
+            count: pendingUnfiltered.length,
+            amount: sumAmount(pendingUnfiltered),
+        },
+        total: {
+            count: allSchedules.length,
+            amount: sumAmount(allSchedules),
+        },
+    };
+    // Each tab's badge counts from that tab's own bucket. A tab that has not been fetched yet
+    // reports undefined rather than 0, so the UI can hide the badge instead of asserting "none".
+    const scheduleCountsByTab = {};
+    ALL_JE_PAGE_TABS.forEach((pageTab) => {
+        const periodTabKey = monthYearPeriodId != null
+            ? getJESchedulePeriodTabKey(pageTab, monthYearPeriodId)
+            : null;
+        const transactionKeys = periodTabKey != null
+            ? jeScheduleTransactionKeysByPeriodAndTab[periodTabKey]
+            : undefined;
+        if (transactionKeys == null) {
+            return;
+        }
+        const accruedKeys = (periodTabKey != null
+            ? jeScheduleAccruedKeysByPeriodAndTab[periodTabKey]
+            : undefined) ?? [];
+        const rowsForTab = [
+            ...transactionKeys.map((transactionKey) => getJEScheduledTransactionByJEScheduleTransactionKey(transactionKey, state)),
+            ...accruedKeys
+                .map((accruedKey) => getJEAccruedScheduleByJEScheduleKey(accruedKey, state))
+                .filter((accruedRow) => accruedRow != null),
+        ];
+        scheduleCountsByTab[pageTab] =
+            pageTab === 'existing_schedules'
+                ? rowsForTab.filter((row) => row.status.code === 'ongoing').length
+                : rowsForTab.filter((row) => row.status.code === 'draft' || isCreatedStatus(row)).length;
+    });
     const allSteps = monthYearPeriodId != null
         ? getAllSteps(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
@@ -145,6 +261,22 @@ export function getExpenseAutomationJESchedulesView(state) {
         { fetchState, error },
         monthEndFetchState,
     ]);
+    const countByType = (schedules) => {
+        const counts = ALL_SCHEDULES_TYPES.reduce((acc, type) => ({ ...acc, [type]: 0 }), {});
+        schedules.forEach((schedule) => {
+            if (schedule.jeScheduleType != null) {
+                counts[schedule.jeScheduleType] += 1;
+            }
+        });
+        return counts;
+    };
+    const jeScheduleTypeCounts = {
+        active: countByType(allSchedules.filter((schedule) => schedule.status.code === 'draft' ||
+            schedule.status.code === 'ongoing' ||
+            schedule.status.code === 'completed' ||
+            schedule.status.code === 'marked_as_completed')),
+        ongoing: countByType(allSchedules.filter((schedule) => schedule.status.code === 'ongoing')),
+    };
     return {
         uncategorizedAccounts,
         allDepreciationAccountList: filteredDepAccounts,
@@ -153,12 +285,17 @@ export function getExpenseAutomationJESchedulesView(state) {
         allAccountList: filteredAccounts,
         accountListNestedAccountHierarchy,
         allClassList: allClasses,
-        completedSchedules,
-        draftSchedules,
-        ongoingSchedules,
+        createdSchedules,
+        createdTotal,
+        hasLoadedForSelectedTab,
+        jeScheduleTypeCounts,
+        scheduleCountsByTab,
+        kpiSummary,
         pendingReviewSchedules,
+        pendingReviewTotal,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
+        newScheduleView,
         postStatusById: postStatusById,
         ignoreStatusById: ignoreStatusById,
         fetchState: reducedFetchStatus.fetchState,

package/lib/esm/view/expenseAutomationView/types/jeSchedulesViewState.js

@@ -16,9 +16,8 @@ const JE_SCHEDULE_SORT_KEYS = [
     'memo',
 ];
 export const toJEScheduleSortKey = (v) => stringToUnion(v, JE_SCHEDULE_SORT_KEYS);
-const JE_SCHEDULE_MAIN_TABS = [
-    'pending_review',
-    'ongoing',
-    'completed',
-];
-export const toJEScheduleMainTab = (v) => stringToUnion(v, JE_SCHEDULE_MAIN_TABS);
+const JE_PAGE_TABS = ['schedules', 'existing_schedules'];
+export const toJEPageTab = (v) => stringToUnion(v, JE_PAGE_TABS);
+export const ALL_JE_PAGE_TABS = JE_PAGE_TABS;
+export const getJESchedulePeriodTabKey = (selectedPageTab, monthYearPeriodId) => `${selectedPageTab}_${monthYearPeriodId}`;
+export const MIN_NEW_SCHEDULE_SEARCH_LENGTH = 2;

package/lib/esm/view/invoicing/createCreditNote/createCreditNoteEpic.js

@@ -1,6 +1,7 @@
-import { of } from 'rxjs';
+import { from } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { updateInvoicingCreditNotes } from '../../../entity/invoicing/creditNote/creditNoteReducer';
+import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { localDataToCreateCreditNotePayload, } from './createCreditNotePayload';
 import { createCreditNoteFailure, createCreditNoteSuccess, submitCreateCreditNote, } from './createCreditNoteReducer';
@@ -15,9 +16,28 @@ export const createCreditNoteEpic = (actions$, state$, zeniAPI) => actions$.pipe
             return [
                 updateInvoicingCreditNotes([response.data], 'merge'),
                 createCreditNoteSuccess({ creditNoteId: response.data.id }),
+                openSnackbar({
+                    messageSection: 'invoicing_credit_note_saved',
+                    messageText: 'success',
+                    type: 'success',
+                }),
             ];
         }
-        return of(createCreditNoteFailure(response.status));
-    }), catchError((error) => of(createCreditNoteFailure(createZeniAPIStatus('Unexpected Error', 'Create credit note REST API call errored out ' +
-        JSON.stringify(error))))));
+        return from([
+            createCreditNoteFailure(response.status),
+            openSnackbar({
+                messageSection: 'invoicing_credit_note_saved',
+                messageText: 'failed',
+                type: 'error',
+            }),
+        ]);
+    }), catchError((error) => from([
+        createCreditNoteFailure(createZeniAPIStatus('Unexpected Error', 'Create credit note REST API call errored out ' +
+            JSON.stringify(error))),
+        openSnackbar({
+            messageSection: 'invoicing_credit_note_saved',
+            messageText: 'failed',
+            type: 'error',
+        }),
+    ])));
 }));

package/lib/esm/view/invoicing/createInvoice/createInvoiceEpic.js

@@ -1,8 +1,9 @@
-import { of } from 'rxjs';
+import { from } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { updateAddresses } from '../../../entity/address/addressReducer';
 import { extractInvoicingInvoiceAddresses } from '../../../entity/invoicing/invoice/invoicePayload';
 import { updateInvoices } from '../../../entity/invoicing/invoice/invoiceReducer';
+import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { addInvoiceToList } from '../invoiceList/invoiceListReducer';
 import { createInvoice, createInvoiceFailure, createInvoiceSuccess, } from './createInvoiceReducer';
@@ -22,9 +23,28 @@ export const createInvoiceEpic = (actions$, _state$, zeniAPI) => actions$.pipe(f
                     status: response.data.status,
                 }),
                 createInvoiceSuccess({ invoiceId: response.data.id }),
+                openSnackbar({
+                    messageSection: 'invoicing_invoice_saved',
+                    messageText: 'success',
+                    type: 'success',
+                }),
             ];
         }
-        return of(createInvoiceFailure(response.status));
-    }), catchError((error) => of(createInvoiceFailure(createZeniAPIStatus('Unexpected Error', 'Create invoice REST API call errored out ' +
-        JSON.stringify(error))))));
+        return from([
+            createInvoiceFailure(response.status),
+            openSnackbar({
+                messageSection: 'invoicing_invoice_saved',
+                messageText: 'failed',
+                type: 'error',
+            }),
+        ]);
+    }), catchError((error) => from([
+        createInvoiceFailure(createZeniAPIStatus('Unexpected Error', 'Create invoice REST API call errored out ' +
+            JSON.stringify(error))),
+        openSnackbar({
+            messageSection: 'invoicing_invoice_saved',
+            messageText: 'failed',
+            type: 'error',
+        }),
+    ])));
 }));

package/lib/esm/view/invoicing/createInvoice/createInvoiceSelector.js

@@ -1,25 +1,52 @@
+import { getAddressByAddressId } from '../../../entity/address/addressSelector';
 import { getInvoicingCatalogListView, getInvoicingCatalogPrices, } from '../invoicingCatalogListView/invoicingCatalogListViewSelector';
 import { getInvoicingCustomerListView } from '../invoicingCustomerListView/invoicingCustomerListViewSelector';
 import { getInvoicingSettings } from '../settingsView/settingsViewSelector';
+/**
+ * Display name for a customer option: company, else the full name, else the
+ * email, else the raw id.
+ */
+const customerDisplayName = (customer) => {
+    const fullName = [customer.firstName, customer.lastName]
+        .filter((part) => part != null && part.trim() !== '')
+        .join(' ')
+        .trim();
+    const company = customer.company?.trim() ?? '';
+    const email = customer.email?.trim() ?? '';
+    return company !== ''
+        ? company
+        : fullName !== ''
+            ? fullName
+            : email !== ''
+                ? email
+                : customer.id;
+};
 /**
  * Single bundled view for the create-invoice screen — web-ui consumes only this.
  * Carries the form draft (`localData`), the option sources the form needs
- * (customers, catalog plans/products, settings), the create-invoice fetch
- * state/error, and the id of the invoice last created (`savedInvoiceId`, to
- * navigate on success). Returns raw entity lists; the screen maps them to its
- * option shapes.
+ * (customer picker rows, catalog plan names, products, settings), the
+ * create-invoice fetch state/error, and the id of the invoice last created
+ * (`savedInvoiceId`, to navigate on success).
  */
 export const getCreateInvoiceFormView = (state) => {
     const createInvoiceState = state.invoicingCreateInvoiceState;
     const catalogListView = getInvoicingCatalogListView(state);
-    const plans = getInvoicingCatalogPrices(catalogListView.plans);
     return {
-        customers: getInvoicingCustomerListView(state).customers,
+        customers: getInvoicingCustomerListView(state).customers.map((customer) => ({
+            billingAddress: customer.billingAddressId != null
+                ? getAddressByAddressId(state.addressState, customer.billingAddressId)
+                : undefined,
+            email: customer.email,
+            id: customer.id,
+            name: customerDisplayName(customer),
+        })),
         localData: createInvoiceState.formDraft,
-        planNames: plans
-            .map((plan) => plan.name ?? '')
-            .filter((name) => name !== ''),
-        plans,
+        planNames: catalogListView.plans.flatMap((plan) => (plan.subFamilies ?? [])
+            .filter((subFamily) => (subFamily.name ?? '') !== '')
+            .map((subFamily) => ({
+            planName: plan.name ?? '',
+            subFamilyName: subFamily.name ?? '',
+        }))),
         products: getInvoicingCatalogPrices(catalogListView.products),
         savedInvoiceId: createInvoiceState.createdInvoiceId,
         settings: getInvoicingSettings(state),

package/lib/esm/view/invoicing/discountAction/discountActionEpic.js

@@ -1,11 +1,28 @@
-import { of } from 'rxjs';
+import { from } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { updateInvoicingCoupons } from '../../../entity/invoicing/coupon/couponReducer';
+import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { runInvoicingDiscountAction, runInvoicingDiscountActionFailure, runInvoicingDiscountActionSuccess, } from './discountActionReducer';
+/** Snackbar copy per action kind; unlisted kinds run without one. */
+const SNACKBAR_SECTION_BY_KIND = {
+    archive: 'invoicing_discount_archive',
+    delete: 'invoicing_discount_delete',
+    unarchive: 'invoicing_discount_unarchive',
+};
 export const runInvoicingDiscountActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(runInvoicingDiscountAction.match), mergeMap((action) => {
     const { action: kind, id } = action.payload;
     const requestBody = { action: kind };
+    const snackbarSection = SNACKBAR_SECTION_BY_KIND[kind];
+    const snackbar = (messageText) => snackbarSection == null
+        ? []
+        : [
+            openSnackbar({
+                messageSection: snackbarSection,
+                messageText,
+                type: messageText === 'success' ? 'success' : 'error',
+            }),
+        ];
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/discounts/${encodeURIComponent(id)}/actions`;
     return zeniAPI
         .postAndGetJSON(apiUrl, requestBody)
@@ -14,15 +31,22 @@ export const runInvoicingDiscountActionEpic = (actions$, _state$, zeniAPI) => ac
             return [
                 updateInvoicingCoupons([response.data], 'merge'),
                 runInvoicingDiscountActionSuccess({ id }),
+                ...snackbar('success'),
             ];
         }
-        return of(runInvoicingDiscountActionFailure({
-            error: response.status,
+        return from([
+            runInvoicingDiscountActionFailure({
+                error: response.status,
+                id,
+            }),
+            ...snackbar('failed'),
+        ]);
+    }), catchError((error) => from([
+        runInvoicingDiscountActionFailure({
+            error: createZeniAPIStatus('Unexpected Error', 'Discount action REST API call errored out ' +
+                JSON.stringify(error)),
             id,
-        }));
-    }), catchError((error) => of(runInvoicingDiscountActionFailure({
-        error: createZeniAPIStatus('Unexpected Error', 'Discount action REST API call errored out ' +
-            JSON.stringify(error)),
-        id,
-    }))));
+        }),
+        ...snackbar('failed'),
+    ])));
 }));

package/lib/esm/view/invoicing/dunningAction/dunningActionEpic.js

@@ -1,10 +1,29 @@
-import { of } from 'rxjs';
+import { from } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { updateInvoicingDunningCases } from '../../../entity/invoicing/dunningCase/dunningCaseReducer';
+import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { runInvoicingDunningAction, runInvoicingDunningActionFailure, runInvoicingDunningActionSuccess, } from './dunningActionReducer';
+/**
+ * Snackbar copy is per action kind; anything not listed here runs without one.
+ */
+const SNACKBAR_SECTION_BY_KIND = {
+    cancel: 'invoicing_dunning_cancel',
+    resolve: 'invoicing_dunning_case_resolved',
+    retry: 'invoicing_dunning_retry',
+};
 export const runInvoicingDunningActionEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(runInvoicingDunningAction.match), mergeMap((action) => {
     const { action: kind, body, id } = action.payload;
+    const snackbarSection = SNACKBAR_SECTION_BY_KIND[kind];
+    const snackbar = (messageText) => snackbarSection == null
+        ? []
+        : [
+            openSnackbar({
+                messageSection: snackbarSection,
+                messageText,
+                type: messageText === 'success' ? 'success' : 'error',
+            }),
+        ];
     const apiUrl = `${zeniAPI.apiEndPoints.invoicingMicroServiceBaseUrl}/1.0/dunning/${encodeURIComponent(id)}/${kind}`;
     return zeniAPI
         .postAndGetJSON(apiUrl, (body ?? {}))
@@ -13,15 +32,22 @@ export const runInvoicingDunningActionEpic = (actions$, _state$, zeniAPI) => act
             return [
                 updateInvoicingDunningCases([response.data], 'merge'),
                 runInvoicingDunningActionSuccess({ id }),
+                ...snackbar('success'),
             ];
         }
-        return of(runInvoicingDunningActionFailure({
-            error: response.status,
+        return from([
+            runInvoicingDunningActionFailure({
+                error: response.status,
+                id,
+            }),
+            ...snackbar('failed'),
+        ]);
+    }), catchError((error) => from([
+        runInvoicingDunningActionFailure({
+            error: createZeniAPIStatus('Unexpected Error', 'Dunning action REST API call errored out ' +
+                JSON.stringify(error)),
             id,
-        }));
-    }), catchError((error) => of(runInvoicingDunningActionFailure({
-        error: createZeniAPIStatus('Unexpected Error', 'Dunning action REST API call errored out ' +
-            JSON.stringify(error)),
-        id,
-    }))));
+        }),
+        ...snackbar('failed'),
+    ])));
 }));

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/catalogDetailEditPayload.js

@@ -116,17 +116,21 @@ export const catalogDetailEditValuesToSavePayload = (values, itemType = 'plan',
 export const createSubFamilyFormToPayload = (itemId, itemType, values) => {
     const name = values.name.trim();
     const priceCode = trimOrUndefined(values.priceCode) ?? toProductCode(name);
+    const tiered = isTieredCatalogPricingModel(values.pricingModel);
     const payload = {
         currency_code: 'USD',
         free_quantity: Number(values.freeQuantity) || 0,
         is_taxable: true,
         item_id: itemId,
         name,
-        price: values.priceDollars?.amount ?? 0,
+        price: tiered ? 0 : (values.priceDollars?.amount ?? 0),
         price_code: priceCode,
         pricing_model: values.pricingModel || 'flat_fee',
         show_description_in_invoices: true,
     };
+    if (tiered) {
+        payload.tiers = (values.tiers ?? []).map(tierToPayload);
+    }
     const description = trimOrUndefined(values.description);
     if (description != null) {
         payload.description = description;

package/lib/esm/view/invoicing/editInvoicingCatalogItemDetailView/saveInvoicingCatalogItemEpic.js

@@ -1,7 +1,8 @@
-import { forkJoin, of } from 'rxjs';
+import { forkJoin, from } from 'rxjs';
 import { catchError, filter, mergeMap } from 'rxjs/operators';
 import { mergeInvoicingPlanSubFamily, updateInvoicingPlans, } from '../../../entity/invoicing/plan/planReducer';
 import { updateInvoicingProducts } from '../../../entity/invoicing/product/productReducer';
+import { openSnackbar } from '../../../entity/snackbar/snackbarReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { addInvoicingCatalogItem } from '../invoicingCatalogListView/invoicingCatalogListViewReducer';
 import { localDataToSaveInvoicingCatalogItemPayload, } from './editInvoicingCatalogItemDetailViewPayload';
@@ -38,7 +39,14 @@ export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actio
                 const failedProductResponse = productResponses.find((productResponse) => !isSuccessResponse(productResponse) ||
                     productResponse.data == null);
                 if (failedProductResponse != null) {
-                    return of(submitInvoicingCatalogItemFormFailure(failedProductResponse.status));
+                    return from([
+                        submitInvoicingCatalogItemFormFailure(failedProductResponse.status),
+                        openSnackbar({
+                            messageSection: 'invoicing_catalog_item_saved',
+                            messageText: 'failed',
+                            type: 'error',
+                        }),
+                    ]);
                 }
                 const savedProducts = productResponses.flatMap((productResponse) => productResponse.data != null ? [productResponse.data] : []);
                 const resultActions = [
@@ -65,6 +73,11 @@ export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actio
                             : 'plan';
                     resultActions.push(addInvoicingCatalogItem({ id: savedItem.id, type: itemType }));
                 }
+                resultActions.push(openSnackbar({
+                    messageSection: 'invoicing_catalog_item_saved',
+                    messageText: 'success',
+                    type: 'success',
+                }));
                 return resultActions;
             };
             const productUpdates = saveInvoicingCatalogItem.match(action)
@@ -75,7 +88,21 @@ export const saveInvoicingCatalogItemEpic = (actions$, state$, zeniAPI) => actio
             }
             return forkJoin(productUpdates.map((productUpdate) => zeniAPI.putAndGetJSON(`${baseUrl}/catalog/products/${encodeURIComponent(productUpdate.id)}`, productUpdate.data))).pipe(mergeMap(completeSave));
         }
-        return of(submitInvoicingCatalogItemFormFailure(response.status));
-    }), catchError((error) => of(submitInvoicingCatalogItemFormFailure(createZeniAPIStatus('Unexpected Error', 'Save catalog item REST API call errored out ' +
-        JSON.stringify(error))))));
+        return from([
+            submitInvoicingCatalogItemFormFailure(response.status),
+            openSnackbar({
+                messageSection: 'invoicing_catalog_item_saved',
+                messageText: 'failed',
+                type: 'error',
+            }),
+        ]);
+    }), catchError((error) => from([
+        submitInvoicingCatalogItemFormFailure(createZeniAPIStatus('Unexpected Error', 'Save catalog item REST API call errored out ' +
+            JSON.stringify(error))),
+        openSnackbar({
+            messageSection: 'invoicing_catalog_item_saved',
+            messageText: 'failed',
+            type: 'error',
+        }),
+    ])));
 }));