@zeniai/client-epic-state 5.0.16-betaSS1 → 5.0.16

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

@@ -1,7 +1,7 @@
 import omit from 'lodash/omit';
 import orderBy from 'lodash/orderBy';
 import { reduceAnyFetchState } from '../../../commonStateTypes/reduceFetchState';
-import { LAST_SCHEDULE_DAY_OF_MONTH, toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
+import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getAccountIdsForTypes } from '../../../entity/account/accountSelector';
 import { getJEScheduledTransactionByJEScheduleTransactionKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
@@ -23,33 +23,19 @@ function getJEScheduleSortAccessor(sortKey) {
         case 'depCategory':
             return (s) => s.jeCredit.account?.accountName?.toLowerCase();
         case 'scheduleCategory':
-            return (s) => s.baseTransaction.account?.accountName?.toLowerCase();
+            return (s) => s.jeScheduleType;
         case 'startMonth':
             return (s) => s.startDate?.valueOf();
         case 'type':
-            return (s) => s.jeScheduleType;
+            return (s) => s.baseTransaction.typeOfTransaction;
         case 'amortizationPeriod':
             return (s) => s.period;
         case 'jePostingDate':
-            return (s) => s.lastDayOfMonth === true
-                ? LAST_SCHEDULE_DAY_OF_MONTH
-                : (s.dayOfPostingDate ?? null);
+            return (s) => s.dayOfPostingDate;
         case 'remainingMonths':
-            return (s) => {
-                const total = s.period ?? 0;
-                const posted = Array.isArray(s.scheduledJournalEntry)
-                    ? s.scheduledJournalEntry.length
-                    : 0;
-                return total - posted;
-            };
+            return (s) => s.period;
         case 'runningBalance':
-            return (s) => {
-                const sje = s.scheduledJournalEntry;
-                if (sje != null && !Array.isArray(sje)) {
-                    return sje.runningBalance?.amount ?? null;
-                }
-                return s.balanceAsOfToday?.amount ?? null;
-            };
+            return (s) => s.balanceAsOfToday?.amount;
         case 'totalAmount':
             return (s) => s.baseTransaction.amount.amount;
         case 'transactionDate':
@@ -128,11 +114,6 @@ export function getExpenseAutomationJESchedulesView(state) {
         });
     });
     const resolveSchedules = sortJEScheduledTransactions(unsortedResolveSchedules, sortKey, sortOrder);
-    const validResolveForPending = unsortedResolveSchedules.filter((r) => jeScheduleLocalDataById[r.scheduledJournalEntry.scheduledJournalEntryID] != null);
-    const pendingReviewSchedules = sortJEScheduledTransactions([
-        ...jeScheduledTransaction.filter((schedule) => schedule.status.code === 'draft'),
-        ...validResolveForPending,
-    ], sortKey, sortOrder);
     const allSteps = monthYearPeriodId != null
         ? getAllSteps(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
@@ -156,7 +137,6 @@ export function getExpenseAutomationJESchedulesView(state) {
         completedSchedules,
         draftSchedules,
         ongoingSchedules,
-        pendingReviewSchedules,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
         postStatusById: postStatusById,

package/lib/esm/view/scheduleView/scheduleListView/scheduleListSelector.js

@@ -47,13 +47,8 @@ const sortedJETransactionsView = (jeTransactions, sortKey, sortOrder) => {
                 return jeTransaction.endDate != null
                     ? jeTransaction.endDate.valueOf()
                     : null;
-            case 'months': {
-                const total = jeTransaction.period ?? 0;
-                const posted = Array.isArray(jeTransaction.scheduledJournalEntry)
-                    ? jeTransaction.scheduledJournalEntry.length
-                    : 0;
-                return total - posted;
-            }
+            case 'months':
+                return jeTransaction.period ?? null;
             case 'transactionType':
                 return jeTransaction.baseTransaction.type.toLowerCase();
             case 'status':