@zeniai/client-epic-state 5.1.76-betaDI0 → 5.1.77

package/lib/esm/view/dashboard/dashboardSelector.js

@@ -2,7 +2,7 @@ import { createSelector } from '@reduxjs/toolkit';
 import { newBalancesFilter } from '../../commonStateTypes/coaBalance/coaBalancesFilter';
 import { reduceFetchState } from '../../commonStateTypes/reduceFetchState';
 import { getCurrentTenant, getTenantsByCheckInDateSelector, } from '../../entity/tenant/tenantSelector';
-import { hasAdminLevelAccess, hasInvestorBankerLevelAccess, isZeniSignedInUser, } from '../../entity/userRole/userRoleType';
+import { hasAdminLevelAccess, hasInvestorBankerLevelAccess, } from '../../entity/userRole/userRoleType';
 import { getApAgingReport } from '../apAgingView/apAgingReport/apAgingSelector';
 import { getArAgingReport } from '../arAgingView/arAgingReport/arAgingSelector';
 import { getBillPayCardReport } from '../billPayCard/billPayCardSelector';
@@ -42,7 +42,7 @@ const tenantSelector = createSelector(getTenantsByCheckInDateSelector, getCurren
 export const getDashboard = createSelector(tenantSelector, getCardBalance, getCashBalance, getOperatingExpensesForLast5Periods, getRevenueForLast4Periods, getTop6Expenses, getNetBurnOrIncomeForLast4Periods, getNetBurnOrIncomeStoryCard, getCashPositionLast5Periods, getCashInCashOutLast4Periods, getInsights, getCompanyPassportView, getTasksCardReport, getBillPayCardReport, getReimbursementCardReport, apAgingSelector, arAgingSelector, getZeniAccountsPromoCard, getRewardsPlanCard, getDashboardCardsOrdered, (state) => {
     const currentTenant = getCurrentTenant(state);
     return getMonthEndCloseChecksViewByTenantId(state, currentTenant.tenantId);
-}, (state) => state.tenantState, (_state, additionalExcludedReports) => additionalExcludedReports, (_state, _additionalExcludedReports, signedInUser) => signedInUser, (_state, _excluded, _signedInUser, isExpenseAutomationFeatureEnabledV2) => isExpenseAutomationFeatureEnabledV2, (_state, _excluded, _signedInUser, _enabledV2, isExpenseAutomationFeatureEnabled) => isExpenseAutomationFeatureEnabled, (state) => state.dashboardState.isTreasuryVideoClosed, (tenants, cardBalance, cashBalance, opEx, revenue, topEx, netBurnOrIncome, netBurnOrIncomeStoryCard, cashPosition, cashInCashOut, insightsView, companyPassportView, tasksCard, billPayCard, reimbursementCard, apAgingReport, arAgingReport, zeniAccountsPromoCard, rewardsPlanCard, cards, monthEndCloseChecksView, tenantState, additionalExcludedReports, signedInUser, isExpenseAutomationFeatureEnabledV2, isExpenseAutomationFeatureEnabled, isTreasuryVideoClosed) => {
+}, (state) => state.tenantState, (_state, additionalExcludedReports) => additionalExcludedReports, (state) => state.dashboardState.isTreasuryVideoClosed, (tenants, cardBalance, cashBalance, opEx, revenue, topEx, netBurnOrIncome, netBurnOrIncomeStoryCard, cashPosition, cashInCashOut, insightsView, companyPassportView, tasksCard, billPayCard, reimbursementCard, apAgingReport, arAgingReport, zeniAccountsPromoCard, rewardsPlanCard, cards, monthEndCloseChecksView, tenantState, additionalExcludedReports, isTreasuryVideoClosed) => {
     const isReimbursementFeatureEnabled = tenants.currentTenant.company?.featuresActivationInfo
         .isReimbursementFeatureEnabled;
     const isBillPayFeatureEnabled = tenants.currentTenant.company?.featuresActivationInfo
@@ -72,20 +72,24 @@ export const getDashboard = createSelector(tenantSelector, getCardBalance, getCa
     if (connectionName === 'netsuite') {
         cardsToRemove.add('cash_in_cash_out');
     }
-    const { isUncategorizedExpenseAccountIdentified, isUncategorizedIncomeAccountIdentified, numOfBillsPendingApproval, numOfReimbursementsPendingApproval, } = tasksCard.tasks;
+    const { isUncategorizedExpenseAccountIdentified, isUncategorizedIncomeAccountIdentified, isUncategorizedExpensesTransactionsExist, isUncategorizedIncomeTransactionsExist, numOfBillsPendingApproval, numOfReimbursementsPendingApproval, } = tasksCard.tasks;
     const showUncategorizedAccountMapping = isUncategorizedExpenseAccountIdentified === false ||
         isUncategorizedIncomeAccountIdentified === false;
-    // Filter out task card if tenant is Expense Automation and there are no tasks other than Expense
-    const isZeniUser = isZeniSignedInUser(signedInUser);
-    const isExpenseAutomationEnabledForUser = isExpenseAutomationFeatureEnabledV2 ||
-        (isExpenseAutomationFeatureEnabled && isZeniUser);
-    const isEmptyTaskCardForExpenseAutomation = showUncategorizedAccountMapping !== true &&
+    // Drop the card only when it would render no rows at all. This mirrors every
+    // row TasksCard can show; keep the two lists in step. Expense Automation
+    // tenants are no longer a special case — they see the uncategorized expense
+    // and income rows like everyone else, so those rows count towards emptiness.
+    // Only judge emptiness once the payload has arrived, so a pending fetch
+    // never hides the card.
+    const isTaskCardEmpty = tasksCard.fetchState === 'Completed' &&
+        showUncategorizedAccountMapping === false &&
         numOfBillsPendingApproval === 0 &&
         numOfReimbursementsPendingApproval === 0 &&
-        isExpenseAutomationEnabledForUser;
+        isUncategorizedExpensesTransactionsExist === false &&
+        isUncategorizedIncomeTransactionsExist === false;
     if (tasksCard.showCard === false ||
         hasTasksCardAccess === false ||
-        isEmptyTaskCardForExpenseAutomation) {
+        isTaskCardEmpty) {
         cardsToRemove.add('task_card');
     }
     const isBankerOrInvestor = tenants.currentTenant?.userRole != null &&

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

@@ -1,8 +1,7 @@
 import { createSelector } from '@reduxjs/toolkit';
 import omit from 'lodash/omit';
-import { reduceAllFetchState, reduceAnyFetchState, } from '../../../commonStateTypes/reduceFetchState';
 import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
-import { getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, } from '../../../entity/tenant/tenantSelector';
+import { getCurrentTenant, getIsAccountingProjectsEnabled, } from '../../../entity/tenant/tenantSelector';
 import { getTransactionWithCOT } from '../../../entity/transaction/transactionHelper';
 import { getSupportedTransactionsByIds } from '../../../entity/transaction/transactionSelector';
 import { getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts, } from '../../accountList/accountListSelector';
@@ -86,7 +85,7 @@ export const toTransactionView = (transaction, transactionLocalData) => {
 // `view/createTransferEntry/createTransferEntrySelector`.
 export { getLastTransferEntryReplacement } from '../../createTransferEntry/createTransferEntrySelector';
 export function getExpenseAutomationTransactionView(state) {
-    const { accountState, classState, classListState, accountListState, createTransferEntryState, expenseAutomationTransactionsViewState, expenseAutomationViewState, projectState, projectListState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
+    const { accountState, classState, classListState, accountListState, createTransferEntryState, expenseAutomationTransactionsViewState, expenseAutomationViewState, projectState, projectListState, transactionState, monthEndCloseChecksState, } = state;
     const { selectedTransactionCategorizationCompletedSubTab, selectedTransactionCategorizationTab, } = expenseAutomationTransactionsViewState;
     const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, filters, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = getUncategorizedAccounts(accountState, accountListState, 'accountList');
@@ -159,21 +158,8 @@ export function getExpenseAutomationTransactionView(state) {
         }
         return [];
     });
-    const monthEndFetchState = monthYearPeriodId != null
-        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
-        : { fetchState: 'Not-Started', error: undefined };
-    const isAccountingClassesEnabled = getIsAccountingClassesEnabled(state);
-    const allFetchStateList = [
-        accountList,
-        expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab],
-    ];
-    if (isAccountingClassesEnabled) {
-        allFetchStateList.push(classList);
-    }
-    const fetchStatus = reduceAnyFetchState([
-        reduceAllFetchState(allFetchStateList),
-        monthEndFetchState,
-    ]);
+    const { fetchState, error } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
+    const fetchStatus = { fetchState, error };
     const totalCountByReview = expenseAutomationTransactionsViewState.transactionCategorizationView.review
         .uiState.totalCount;
     const totalCountByAutoCat = expenseAutomationTransactionsViewState.transactionCategorizationView

package/lib/view/dashboard/dashboardSelector.d.ts

@@ -1,6 +1,6 @@
 import { ReportID, SelectorReport, SelectorView } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { TenantsOrdered } from '../../entity/tenant/tenantSelector';
-import { LoggedInUser, Tenant } from '../../entity/tenant/tenantState';
+import { Tenant } from '../../entity/tenant/tenantState';
 import { RootState } from '../../reducer';
 import { CardType } from './dashboardState';
 export interface DashboardReport extends SelectorReport {
@@ -11,5 +11,4 @@ export interface DashboardReport extends SelectorReport {
     tenantsOrdered: TenantsOrdered;
     currentTenant?: Tenant;
 }
-export declare const getDashboard: (state: RootState, additionalExcludedReports: ReportID[], // used when reports are excluded through statsig
-signedInUser: LoggedInUser | undefined, isExpenseAutomationFeatureEnabledV2: boolean, isExpenseAutomationFeatureEnabled: boolean) => DashboardReport;
+export declare const getDashboard: (state: RootState, additionalExcludedReports: ReportID[]) => DashboardReport;

package/lib/view/dashboard/dashboardSelector.js

@@ -45,7 +45,7 @@ const tenantSelector = (0, toolkit_1.createSelector)(tenantSelector_1.getTenants
 exports.getDashboard = (0, toolkit_1.createSelector)(tenantSelector, cardBalanceSelector_1.getCardBalance, cashBalanceSelector_1.getCashBalance, getOperatingExpensesForLast5Periods, getRevenueForLast4Periods, topExSelector_1.getTop6Expenses, getNetBurnOrIncomeForLast4Periods, getNetBurnOrIncomeStoryCard, getCashPositionLast5Periods, getCashInCashOutLast4Periods, insightsCardSelector_1.getInsights, companyPassportViewSelector_1.getCompanyPassportView, tasksCardSelector_1.getTasksCardReport, billPayCardSelector_1.getBillPayCardReport, reimbursementCardSelector_1.getReimbursementCardReport, apAgingSelector, arAgingSelector, zeniAccountsPromoCardSelector_1.getZeniAccountsPromoCard, referralSelector_1.getRewardsPlanCard, dashboardLayoutSelector_1.getDashboardCardsOrdered, (state) => {
     const currentTenant = (0, tenantSelector_1.getCurrentTenant)(state);
     return (0, monthEndCloseChecksViewSelector_1.getMonthEndCloseChecksViewByTenantId)(state, currentTenant.tenantId);
-}, (state) => state.tenantState, (_state, additionalExcludedReports) => additionalExcludedReports, (_state, _additionalExcludedReports, signedInUser) => signedInUser, (_state, _excluded, _signedInUser, isExpenseAutomationFeatureEnabledV2) => isExpenseAutomationFeatureEnabledV2, (_state, _excluded, _signedInUser, _enabledV2, isExpenseAutomationFeatureEnabled) => isExpenseAutomationFeatureEnabled, (state) => state.dashboardState.isTreasuryVideoClosed, (tenants, cardBalance, cashBalance, opEx, revenue, topEx, netBurnOrIncome, netBurnOrIncomeStoryCard, cashPosition, cashInCashOut, insightsView, companyPassportView, tasksCard, billPayCard, reimbursementCard, apAgingReport, arAgingReport, zeniAccountsPromoCard, rewardsPlanCard, cards, monthEndCloseChecksView, tenantState, additionalExcludedReports, signedInUser, isExpenseAutomationFeatureEnabledV2, isExpenseAutomationFeatureEnabled, isTreasuryVideoClosed) => {
+}, (state) => state.tenantState, (_state, additionalExcludedReports) => additionalExcludedReports, (state) => state.dashboardState.isTreasuryVideoClosed, (tenants, cardBalance, cashBalance, opEx, revenue, topEx, netBurnOrIncome, netBurnOrIncomeStoryCard, cashPosition, cashInCashOut, insightsView, companyPassportView, tasksCard, billPayCard, reimbursementCard, apAgingReport, arAgingReport, zeniAccountsPromoCard, rewardsPlanCard, cards, monthEndCloseChecksView, tenantState, additionalExcludedReports, isTreasuryVideoClosed) => {
     const isReimbursementFeatureEnabled = tenants.currentTenant.company?.featuresActivationInfo
         .isReimbursementFeatureEnabled;
     const isBillPayFeatureEnabled = tenants.currentTenant.company?.featuresActivationInfo
@@ -75,20 +75,24 @@ exports.getDashboard = (0, toolkit_1.createSelector)(tenantSelector, cardBalance
     if (connectionName === 'netsuite') {
         cardsToRemove.add('cash_in_cash_out');
     }
-    const { isUncategorizedExpenseAccountIdentified, isUncategorizedIncomeAccountIdentified, numOfBillsPendingApproval, numOfReimbursementsPendingApproval, } = tasksCard.tasks;
+    const { isUncategorizedExpenseAccountIdentified, isUncategorizedIncomeAccountIdentified, isUncategorizedExpensesTransactionsExist, isUncategorizedIncomeTransactionsExist, numOfBillsPendingApproval, numOfReimbursementsPendingApproval, } = tasksCard.tasks;
     const showUncategorizedAccountMapping = isUncategorizedExpenseAccountIdentified === false ||
         isUncategorizedIncomeAccountIdentified === false;
-    // Filter out task card if tenant is Expense Automation and there are no tasks other than Expense
-    const isZeniUser = (0, userRoleType_1.isZeniSignedInUser)(signedInUser);
-    const isExpenseAutomationEnabledForUser = isExpenseAutomationFeatureEnabledV2 ||
-        (isExpenseAutomationFeatureEnabled && isZeniUser);
-    const isEmptyTaskCardForExpenseAutomation = showUncategorizedAccountMapping !== true &&
+    // Drop the card only when it would render no rows at all. This mirrors every
+    // row TasksCard can show; keep the two lists in step. Expense Automation
+    // tenants are no longer a special case — they see the uncategorized expense
+    // and income rows like everyone else, so those rows count towards emptiness.
+    // Only judge emptiness once the payload has arrived, so a pending fetch
+    // never hides the card.
+    const isTaskCardEmpty = tasksCard.fetchState === 'Completed' &&
+        showUncategorizedAccountMapping === false &&
         numOfBillsPendingApproval === 0 &&
         numOfReimbursementsPendingApproval === 0 &&
-        isExpenseAutomationEnabledForUser;
+        isUncategorizedExpensesTransactionsExist === false &&
+        isUncategorizedIncomeTransactionsExist === false;
     if (tasksCard.showCard === false ||
         hasTasksCardAccess === false ||
-        isEmptyTaskCardForExpenseAutomation) {
+        isTaskCardEmpty) {
         cardsToRemove.add('task_card');
     }
     const isBankerOrInvestor = tenants.currentTenant?.userRole != null &&

package/lib/view/expenseAutomationView/selectors/transactionCategorizationSelector.js

@@ -7,7 +7,6 @@ exports.getLastTransferEntryReplacement = exports.toTransactionView = exports.ge
 exports.getExpenseAutomationTransactionView = getExpenseAutomationTransactionView;
 const toolkit_1 = require("@reduxjs/toolkit");
 const omit_1 = __importDefault(require("lodash/omit"));
-const reduceFetchState_1 = require("../../../commonStateTypes/reduceFetchState");
 const timePeriod_1 = require("../../../commonStateTypes/timePeriod");
 const tenantSelector_1 = require("../../../entity/tenant/tenantSelector");
 const transactionHelper_1 = require("../../../entity/transaction/transactionHelper");
@@ -96,7 +95,7 @@ exports.toTransactionView = toTransactionView;
 var createTransferEntrySelector_2 = require("../../createTransferEntry/createTransferEntrySelector");
 Object.defineProperty(exports, "getLastTransferEntryReplacement", { enumerable: true, get: function () { return createTransferEntrySelector_2.getLastTransferEntryReplacement; } });
 function getExpenseAutomationTransactionView(state) {
-    const { accountState, classState, classListState, accountListState, createTransferEntryState, expenseAutomationTransactionsViewState, expenseAutomationViewState, projectState, projectListState, transactionState, monthEndCloseChecksState, monthEndCloseChecksViewState, } = state;
+    const { accountState, classState, classListState, accountListState, createTransferEntryState, expenseAutomationTransactionsViewState, expenseAutomationViewState, projectState, projectListState, transactionState, monthEndCloseChecksState, } = state;
     const { selectedTransactionCategorizationCompletedSubTab, selectedTransactionCategorizationTab, } = expenseAutomationTransactionsViewState;
     const { uiState, refreshStatus, saveStatus, markAsNotMiscategorizedStatus, transactionIdsBySelectedPeriod, transactionReviewLocalDataById, selectedCheckBoxTransactionIds, transactionIdsWithUnsavedData, uploadReceiptStatusById, selectedTransactionId, selectedTransactionLineId, filters, } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
     const uncategorizedIncomeExpense = (0, accountListSelector_1.getUncategorizedAccounts)(accountState, accountListState, 'accountList');
@@ -169,21 +168,8 @@ function getExpenseAutomationTransactionView(state) {
         }
         return [];
     });
-    const monthEndFetchState = monthYearPeriodId != null
-        ? (monthEndCloseChecksViewState.monthEndCloseChecksViewByTenantId[currentTenant.tenantId]?.[monthYearPeriodId] ?? { fetchState: 'Not-Started', error: undefined })
-        : { fetchState: 'Not-Started', error: undefined };
-    const isAccountingClassesEnabled = (0, tenantSelector_1.getIsAccountingClassesEnabled)(state);
-    const allFetchStateList = [
-        accountList,
-        expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab],
-    ];
-    if (isAccountingClassesEnabled) {
-        allFetchStateList.push(classList);
-    }
-    const fetchStatus = (0, reduceFetchState_1.reduceAnyFetchState)([
-        (0, reduceFetchState_1.reduceAllFetchState)(allFetchStateList),
-        monthEndFetchState,
-    ]);
+    const { fetchState, error } = expenseAutomationTransactionsViewState.transactionCategorizationView[selectedTransactionCategorizationTab];
+    const fetchStatus = { fetchState, error };
     const totalCountByReview = expenseAutomationTransactionsViewState.transactionCategorizationView.review
         .uiState.totalCount;
     const totalCountByAutoCat = expenseAutomationTransactionsViewState.transactionCategorizationView

package/package.json

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