From 9a80a006cef1fcf71e66c223c69a5e775496be0e Mon Sep 17 00:00:00 2001
From: Jack <jack@monkeytype.com>
Date: Thu, 20 Jul 2023 21:32:13 +0200
Subject: [PATCH] Storing start month in user prefs (#1237)
---
.../src/components/budget/index.js | 26 ++++++++++++-------
upcoming-release-notes/1237.md | 6 +++++
2 files changed, 23 insertions(+), 9 deletions(-)
create mode 100644 upcoming-release-notes/1237.md
diff --git a/packages/desktop-client/src/components/budget/index.js b/packages/desktop-client/src/components/budget/index.js
index 2436b32ef..6ca175309 100644
--- a/packages/desktop-client/src/components/budget/index.js
+++ b/packages/desktop-client/src/components/budget/index.js
@@ -38,8 +38,7 @@ class Budget extends PureComponent {
const currentMonth = _initialBudgetMonth || monthUtils.currentMonth();
this.state = {
initialized: false,
- prewarmStartMonth: currentMonth,
- startMonth: currentMonth,
+ prewarmStartMonth: props.startMonth || currentMonth,
newCategoryForGroup: null,
isAddingGroup: false,
collapsed: props.collapsedPrefs || [],
@@ -105,10 +104,13 @@ class Budget extends PureComponent {
this.props.savePrefs({ 'budget.collapsed': this.state.collapsed });
}
- if (prevState.startMonth !== this.state.startMonth) {
+ const currentMonth = _initialBudgetMonth || monthUtils.currentMonth();
+ const startMonth = this.props.startMonth || currentMonth;
+
+ if (prevState.startMonth !== startMonth) {
// Save it off into a global state so if the component re-mounts
// we keep this state (but don't need to subscribe to it)
- _initialBudgetMonth = this.state.startMonth;
+ _initialBudgetMonth = startMonth;
}
if (this.props.accountId !== prevProps.accountId) {
@@ -143,9 +145,11 @@ class Budget extends PureComponent {
};
async prewarmAllMonths(bounds, type = null) {
- let { startMonth } = this.state;
let numMonths = 3;
+ const currentMonth = _initialBudgetMonth || monthUtils.currentMonth();
+ const startMonth = this.props.startMonth || currentMonth;
+
bounds = getValidMonthBounds(
bounds,
monthUtils.subMonths(startMonth, 1),
@@ -159,12 +163,13 @@ class Budget extends PureComponent {
}
onMonthSelect = async (month, numDisplayed) => {
- let { startMonth } = this.state;
-
this.setState({ prewarmStartMonth: month });
this.warmingMonth = month;
+ const currentMonth = _initialBudgetMonth || monthUtils.currentMonth();
+ const startMonth = this.props.startMonth || currentMonth;
+
// We could be smarter about this, but this is a good start. We
// optimize for the case where users press the left/right button
// to move between months. This loads the month data all at once
@@ -180,7 +185,7 @@ class Budget extends PureComponent {
}
if (this.warmingMonth === month) {
- this.setState({ startMonth: month });
+ this.props.savePrefs({ 'budget.startMonth': month });
}
};
@@ -408,7 +413,6 @@ class Budget extends PureComponent {
initialized,
categoryGroups,
prewarmStartMonth,
- startMonth,
newCategoryForGroup,
isAddingGroup,
collapsed,
@@ -422,6 +426,9 @@ class Budget extends PureComponent {
return null;
}
+ const currentMonth = _initialBudgetMonth || monthUtils.currentMonth();
+ const startMonth = this.props.startMonth || currentMonth;
+
let table;
if (type === 'report') {
table = (
@@ -575,6 +582,7 @@ function BudgetWrapper(props) {
export default connect(
state => ({
+ startMonth: state.prefs.local['budget.startMonth'],
collapsedPrefs: state.prefs.local['budget.collapsed'],
summaryCollapsed: state.prefs.local['budget.summaryCollapsed'],
budgetType: state.prefs.local.budgetType || 'rollover',
diff --git a/upcoming-release-notes/1237.md b/upcoming-release-notes/1237.md
new file mode 100644
index 000000000..d78df1062
--- /dev/null
+++ b/upcoming-release-notes/1237.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [Miodec]
+---
+
+Remembering the currently selected month in user prefs
--
GitLab