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

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 { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
+import { LAST_SCHEDULE_DAY_OF_MONTH, toMonthYearPeriodId, } from '../../../commonStateTypes/timePeriod';
 import { getAccountIdsForTypes } from '../../../entity/account/accountSelector';
 import { getJEScheduledTransactionByJEScheduleTransactionKey, } from '../../../entity/jeSchedules/jeSchedulesSelector';
 import { getCurrentTenant } from '../../../entity/tenant/tenantSelector';
@@ -23,19 +23,33 @@ function getJEScheduleSortAccessor(sortKey) {
         case 'depCategory':
             return (s) => s.jeCredit.account?.accountName?.toLowerCase();
         case 'scheduleCategory':
-            return (s) => s.jeScheduleType;
+            return (s) => s.baseTransaction.account?.accountName?.toLowerCase();
         case 'startMonth':
             return (s) => s.startDate?.valueOf();
         case 'type':
-            return (s) => s.baseTransaction.typeOfTransaction;
+            return (s) => s.jeScheduleType;
         case 'amortizationPeriod':
             return (s) => s.period;
         case 'jePostingDate':
-            return (s) => s.dayOfPostingDate;
+            return (s) => s.lastDayOfMonth === true
+                ? LAST_SCHEDULE_DAY_OF_MONTH
+                : (s.dayOfPostingDate ?? null);
         case 'remainingMonths':
-            return (s) => s.period;
+            return (s) => {
+                const total = s.period ?? 0;
+                const posted = Array.isArray(s.scheduledJournalEntry)
+                    ? s.scheduledJournalEntry.length
+                    : 0;
+                return total - posted;
+            };
         case 'runningBalance':
-            return (s) => s.balanceAsOfToday?.amount;
+            return (s) => {
+                const sje = s.scheduledJournalEntry;
+                if (sje != null && !Array.isArray(sje)) {
+                    return sje.runningBalance?.amount ?? null;
+                }
+                return s.balanceAsOfToday?.amount ?? null;
+            };
         case 'totalAmount':
             return (s) => s.baseTransaction.amount.amount;
         case 'transactionDate':
@@ -114,6 +128,11 @@ 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)
         : [];
@@ -137,6 +156,7 @@ export function getExpenseAutomationJESchedulesView(state) {
         completedSchedules,
         draftSchedules,
         ongoingSchedules,
+        pendingReviewSchedules,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
         postStatusById: postStatusById,

package/lib/esm/view/monthEndCloseChecksView/monthEndCloseChecksViewSelector.js

@@ -1,24 +1,28 @@
 import { createSelector } from '@reduxjs/toolkit';
+import isEqual from 'lodash/isEqual';
 import { DEFAULT_DATE_FORMAT } from '../../commonStateTypes/fiscalYearHelpers/formatZeniDateFY';
-import { toMonthYearPeriodId, } from '../../commonStateTypes/timePeriod';
+import { toMonth, toMonthYearPeriodId, } from '../../commonStateTypes/timePeriod';
 import { getMonthEndCloseChecksByTenantId } from '../../entity/monthEndCloseChecks/monthEndCloseChecksSelector';
 import { defaultMonthYearPeriod } from '../../entity/tenant/epic/fetchAllTenantsEpic';
 import { getCurrentTenant, } from '../../entity/tenant/tenantSelector';
-import { date } from '../../zeniDayJS';
+import { date, dateNow } from '../../zeniDayJS';
 export const isMonthEndInsightDisabled = (currentTenant, selectedPeriod, userAllowedToAccessMonthEndInsights, auditSummary) => {
-    console.log('jklogs ~ isMonthEndInsightDisabled ~ selectedPeriod:', selectedPeriod);
-    console.log('jklogs ~ isMonthEndInsightDisabled ~ userAllowedToAccessMonthEndInsights:', userAllowedToAccessMonthEndInsights);
     if (auditSummary != null) {
         if (auditSummary.auditScorePercentage < 75 &&
             userAllowedToAccessMonthEndInsights === false) {
             return true;
         }
+        const previousMonthPeriod = {
+            month: toMonth(dateNow().subtract(1, 'month').month() + 1),
+            year: dateNow().subtract(1, 'month').year(),
+        };
+        if (!isEqual(previousMonthPeriod, selectedPeriod)) {
+            return true;
+        }
         // if the selected period is November 2024, then book close date should not be null and book close date should be 30th November 2024
         const { bookCloseDate } = currentTenant;
-        console.log('jklogs ~ isMonthEndInsightDisabled ~ bookCloseDate:', bookCloseDate);
         const selectedPeriodFirstDay = date(`${selectedPeriod.year}-${selectedPeriod.month}-01`);
         const selectedPeriodLastDay = selectedPeriodFirstDay.endOf('month');
-        console.log('jklogs ~ isMonthEndInsightDisabled ~ selectedPeriodLastDay:', selectedPeriodLastDay);
         if (bookCloseDate == null ||
             bookCloseDate.format(DEFAULT_DATE_FORMAT) !==
                 selectedPeriodLastDay.format(DEFAULT_DATE_FORMAT)) {
@@ -52,7 +56,7 @@ export const getMonthEndCloseChecksViewByTenantId = createSelector((state) => st
             if (check.id === 'month_end_insights') {
                 const isDisabled = monthEndCloseChecks.reportEmailSentDate == null
                     ? isMonthEndInsightDisabled(currentTenant, selectedPeriod, userAllowedToAccessMonthEndInsights, monthEndCloseChecks.auditSummary)
-                    : true;
+                    : false;
                 return {
                     ...check,
                     isDisabled,

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

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

package/lib/view/expenseAutomationView/selectorTypes/jeSchedulesSelectorTypes.d.ts

@@ -24,6 +24,7 @@ export interface ExpenseAutomationJESchedulesViewSelector extends SelectorView {
     ignoreStatusById: Record<JEScheduleTransactionKey, FetchStateAndError>;
     jeScheduleLocalDataById: Record<ID, JEScheduleLocalData>;
     ongoingSchedules: JEScheduledTransaction[];
+    pendingReviewSchedules: (JEScheduledTransaction | JEScheduledTransactionWithFailedEntries)[];
     postStatusById: Record<ID, FetchStateAndError>;
     refreshStatus: FetchStateAndError;
     resolveSchedules: JEScheduledTransactionWithFailedEntries[];

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

@@ -29,19 +29,33 @@ function getJEScheduleSortAccessor(sortKey) {
         case 'depCategory':
             return (s) => s.jeCredit.account?.accountName?.toLowerCase();
         case 'scheduleCategory':
-            return (s) => s.jeScheduleType;
+            return (s) => s.baseTransaction.account?.accountName?.toLowerCase();
         case 'startMonth':
             return (s) => s.startDate?.valueOf();
         case 'type':
-            return (s) => s.baseTransaction.typeOfTransaction;
+            return (s) => s.jeScheduleType;
         case 'amortizationPeriod':
             return (s) => s.period;
         case 'jePostingDate':
-            return (s) => s.dayOfPostingDate;
+            return (s) => s.lastDayOfMonth === true
+                ? timePeriod_1.LAST_SCHEDULE_DAY_OF_MONTH
+                : (s.dayOfPostingDate ?? null);
         case 'remainingMonths':
-            return (s) => s.period;
+            return (s) => {
+                const total = s.period ?? 0;
+                const posted = Array.isArray(s.scheduledJournalEntry)
+                    ? s.scheduledJournalEntry.length
+                    : 0;
+                return total - posted;
+            };
         case 'runningBalance':
-            return (s) => s.balanceAsOfToday?.amount;
+            return (s) => {
+                const sje = s.scheduledJournalEntry;
+                if (sje != null && !Array.isArray(sje)) {
+                    return sje.runningBalance?.amount ?? null;
+                }
+                return s.balanceAsOfToday?.amount ?? null;
+            };
         case 'totalAmount':
             return (s) => s.baseTransaction.amount.amount;
         case 'transactionDate':
@@ -120,6 +134,11 @@ 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
         ? (0, expenseAutomationViewSelectorTypes_1.getAllSteps)(monthEndCloseChecksState, monthYearPeriodId, currentTenant.tenantId)
         : [];
@@ -143,6 +162,7 @@ function getExpenseAutomationJESchedulesView(state) {
         completedSchedules,
         draftSchedules,
         ongoingSchedules,
+        pendingReviewSchedules,
         resolveSchedules: resolveSchedules,
         accountSettingsView,
         postStatusById: postStatusById,

package/lib/view/monthEndCloseChecksView/monthEndCloseChecksViewSelector.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMonthEndCloseChecksViewByTenantId = exports.isMonthEndInsightDisabled = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
+const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const formatZeniDateFY_1 = require("../../commonStateTypes/fiscalYearHelpers/formatZeniDateFY");
 const timePeriod_1 = require("../../commonStateTypes/timePeriod");
 const monthEndCloseChecksSelector_1 = require("../../entity/monthEndCloseChecks/monthEndCloseChecksSelector");
@@ -9,19 +13,22 @@ const fetchAllTenantsEpic_1 = require("../../entity/tenant/epic/fetchAllTenantsE
 const tenantSelector_1 = require("../../entity/tenant/tenantSelector");
 const zeniDayJS_1 = require("../../zeniDayJS");
 const isMonthEndInsightDisabled = (currentTenant, selectedPeriod, userAllowedToAccessMonthEndInsights, auditSummary) => {
-    console.log('jklogs ~ isMonthEndInsightDisabled ~ selectedPeriod:', selectedPeriod);
-    console.log('jklogs ~ isMonthEndInsightDisabled ~ userAllowedToAccessMonthEndInsights:', userAllowedToAccessMonthEndInsights);
     if (auditSummary != null) {
         if (auditSummary.auditScorePercentage < 75 &&
             userAllowedToAccessMonthEndInsights === false) {
             return true;
         }
+        const previousMonthPeriod = {
+            month: (0, timePeriod_1.toMonth)((0, zeniDayJS_1.dateNow)().subtract(1, 'month').month() + 1),
+            year: (0, zeniDayJS_1.dateNow)().subtract(1, 'month').year(),
+        };
+        if (!(0, isEqual_1.default)(previousMonthPeriod, selectedPeriod)) {
+            return true;
+        }
         // if the selected period is November 2024, then book close date should not be null and book close date should be 30th November 2024
         const { bookCloseDate } = currentTenant;
-        console.log('jklogs ~ isMonthEndInsightDisabled ~ bookCloseDate:', bookCloseDate);
         const selectedPeriodFirstDay = (0, zeniDayJS_1.date)(`${selectedPeriod.year}-${selectedPeriod.month}-01`);
         const selectedPeriodLastDay = selectedPeriodFirstDay.endOf('month');
-        console.log('jklogs ~ isMonthEndInsightDisabled ~ selectedPeriodLastDay:', selectedPeriodLastDay);
         if (bookCloseDate == null ||
             bookCloseDate.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT) !==
                 selectedPeriodLastDay.format(formatZeniDateFY_1.DEFAULT_DATE_FORMAT)) {
@@ -56,7 +63,7 @@ exports.getMonthEndCloseChecksViewByTenantId = (0, toolkit_1.createSelector)((st
             if (check.id === 'month_end_insights') {
                 const isDisabled = monthEndCloseChecks.reportEmailSentDate == null
                     ? (0, exports.isMonthEndInsightDisabled)(currentTenant, selectedPeriod, userAllowedToAccessMonthEndInsights, monthEndCloseChecks.auditSummary)
-                    : true;
+                    : false;
                 return {
                     ...check,
                     isDisabled,

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

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

package/package.json

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