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

package/lib/esm/view/financeStatement/financeStatementReducer.js

@@ -17,6 +17,7 @@ export const initialFinanceStatementState = {
     displayOrder: 'ascending_date',
     reportFormat: 'more_detailed',
     lastFetchRequestTime: undefined,
+    isPeriodSelectionExplicit: false,
 };
 const financeStatement = createSlice({
     name: 'financeStatement',
@@ -33,14 +34,26 @@ const financeStatement = 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;
@@ -55,6 +68,7 @@ const financeStatement = createSlice({
                     };
                     const newThisPeriod = getMatchingThisPeriod(action.payload.firstMonthOfFY, timeframe, action.payload.thisPeriod, safeCoaBalances);
                     if (newThisPeriod != null) {
+                        draft.isPeriodSelectionExplicit = true;
                         const selectionRanges = getSelectedAndHighlightedRangesForThisPeriod({
                             firstMonthOfFY,
                             thisPeriod: newThisPeriod,
@@ -95,6 +109,14 @@ const financeStatement = 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 = extractThisPeriod(action.payload.firstMonthOfFY, timeframe, selectedCOABalancesRange, safeCoaBalances);
                 if (thisPeriod != null) {