@zeniai/client-epic-state 5.2.37 → 5.2.39-betaRD0

package/lib/view/financeStatement/financeStatementReducer.js

@@ -21,6 +21,7 @@ exports.initialFinanceStatementState = {
     displayOrder: 'ascending_date',
     reportFormat: 'more_detailed',
     lastFetchRequestTime: undefined,
+    isPeriodSelectionExplicit: false,
 };
 const financeStatement = (0, toolkit_1.createSlice)({
     name: 'financeStatement',
@@ -37,14 +38,26 @@ const financeStatement = (0, toolkit_1.createSlice)({
             },
         },
         updateFinanceStatementTimeframe(draft, action) {
+            // A month anchor is meaningless once the timeframe becomes quarter/year, so
+            // a real timeframe change has to drop it. Callers also re-dispatch the
+            // *current* timeframe as a side effect of unrelated UI (report format, view
+            // switches); dropping the anchor there silently resets the user's period to
+            // the latest one, so leave the selection alone when nothing changed.
+            if (draft.timeframe === action.payload) {
+                return;
+            }
             draft.timeframe = action.payload;
             draft.selectedCOABalancesRange = {
                 numberOfPeriods: draft.selectedCOABalancesRange.numberOfPeriods,
                 orderBy: draft.selectedCOABalancesRange.orderBy,
             };
+            draft.isPeriodSelectionExplicit = false;
         },
         updateCOABalancesRange(draft, action) {
             draft.selectedCOABalancesRange = Object.assign({}, action.payload);
+            // A range without an anchor is a programmatic reset to the default, not a
+            // user pick (e.g. leaving the horizontal by-class layout).
+            draft.isPeriodSelectionExplicit = action.payload.thisPeriod != null;
         },
         updateFinanceStatementThisPeriod(draft, action) {
             const { firstMonthOfFY, coaBalances, maxNumOfPeriodsToHighlight } = action.payload;
@@ -59,6 +72,7 @@ const financeStatement = (0, toolkit_1.createSlice)({
                     };
                     const newThisPeriod = (0, thisPeriodHelpers_1.getMatchingThisPeriod)(action.payload.firstMonthOfFY, timeframe, action.payload.thisPeriod, safeCoaBalances);
                     if (newThisPeriod != null) {
+                        draft.isPeriodSelectionExplicit = true;
                         const selectionRanges = (0, getSelectedAndHighlightedRanges_1.getSelectedAndHighlightedRangesForThisPeriod)({
                             firstMonthOfFY,
                             thisPeriod: newThisPeriod,
@@ -99,6 +113,14 @@ const financeStatement = (0, toolkit_1.createSlice)({
             draft.isAdditionalBalancesShown =
                 additionalBalances.length != 0 ? true : false;
             const { timeframe, selectedCOABalancesRange } = draft;
+            // The reports page fires this on load, on window resize and on every
+            // fetch-state transition (so also on report switch and on remount after a
+            // drill-down), carrying a viewport-derived period count. Re-deriving the
+            // range from that count silently discards a range the user chose, so only
+            // the column metadata above is applied once the selection is theirs.
+            if (draft.isPeriodSelectionExplicit) {
+                return;
+            }
             if (safeCoaBalances.length > 0) {
                 const thisPeriod = (0, thisPeriodHelpers_1.extractThisPeriod)(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
                 if (thisPeriod != null) {

package/lib/view/financeStatement/financeStatementState.d.ts

@@ -2,6 +2,13 @@ import { ReportUIState } from '../../commonStateTypes/viewAndReport/reportUIStat
 import { ReportID } from '../../commonStateTypes/viewAndReport/viewAndReport';
 import { ZeniDate } from '../../zeniDayJS';
 export interface FinanceStatementState extends ReportUIState {
+    /**
+     * True once the user has picked a period range themselves (date-range picker or
+     * a period column click), as opposed to the viewport-derived default the page
+     * applies on load. While true, automatic column refits must not resize the
+     * selection.
+     */
+    isPeriodSelectionExplicit: boolean;
     selectedReportId: ReportID;
     lastFetchRequestTime?: ZeniDate;
 }

package/lib/view/spendManagement/billPay/billList/billListSelector.js

@@ -440,7 +440,7 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
                     }
                 }
                 else {
-                    if (Boolean(transaction.billPayInfo.paymentDate) === true) {
+                    if (Boolean((0, billListFilterHelpers_1.getActualPaymentDate)(transaction.billPayInfo)) === true) {
                         transactionsWithSortKeyValue.push(transaction);
                     }
                     else {
@@ -525,7 +525,7 @@ const getBillListOnSort = (sortKey, sortOrder, currentTab, transactions) => {
             case 'dueDate':
                 return currentTab === 'draft'
                     ? transaction.dueDate
-                    : transaction.billPayInfo.paymentDate;
+                    : (0, billListFilterHelpers_1.getActualPaymentDate)(transaction.billPayInfo);
             case 'status':
                 return getStatusPerTab(transaction);
             case 'amount':

package/package.json

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