Merge branch 'master' into removeStaticColors

actualbudget · Nov 9, 2023 · 6e9b455 · 6e9b455
2 parents b127a3d + 45bb769
commit 6e9b455
Show file tree

Hide file tree

Showing 19 changed files with 318 additions and 126 deletions.
diff --git a/packages/desktop-client/src/components/accounts/Account.js b/packages/desktop-client/src/components/accounts/Account.js
@@ -1201,6 +1201,7 @@ class AccountInternal extends PureComponent {
             items={allTransactions}
             fetchAllIds={this.fetchAllIds}
             registerDispatch={dispatch => (this.dispatchSelected = dispatch)}
+            selectAllFilter={item => !item._unmatched && !item.is_parent}
           >
             <View style={styles.page}>
               <AccountHeader

diff --git a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
@@ -1,5 +1,6 @@
 import React, { type ComponentProps } from 'react';
 
+import useFeatureFlag from '../../hooks/useFeatureFlag';
 import ArrowThinRight from '../../icons/v1/ArrowThinRight';
 import { type CSSProperties } from '../../style';
 import View from '../common/View';
@@ -11,6 +12,8 @@ import { makeAmountStyle } from './util';
 type BalanceWithCarryoverProps = {
   carryover: ComponentProps<typeof CellValue>['binding'];
   balance: ComponentProps<typeof CellValue>['binding'];
+  goal?: ComponentProps<typeof CellValue>['binding'];
+  budgeted?: ComponentProps<typeof CellValue>['binding'];
   disabled?: boolean;
   style?: CSSProperties;
   balanceStyle?: CSSProperties;
@@ -19,20 +22,30 @@ type BalanceWithCarryoverProps = {
 export default function BalanceWithCarryover({
   carryover,
   balance,
+  goal,
+  budgeted,
   disabled,
   style,
   balanceStyle,
   carryoverStyle,
 }: BalanceWithCarryoverProps) {
   let carryoverValue = useSheetValue(carryover);
   let balanceValue = useSheetValue(balance);
-
+  let goalValue = useSheetValue(goal);
+  let budgetedValue = useSheetValue(budgeted);
+  let isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');
   return (
     <View style={style}>
       <CellValue
         binding={balance}
         type="financial"
-        getStyle={makeAmountStyle}
+        getStyle={value =>
+          makeAmountStyle(
+            value,
+            isGoalTemplatesEnabled ? goalValue : null,
+            budgetedValue,
+          )
+        }
         style={{
           textAlign: 'right',
           ...(!disabled && {
@@ -58,7 +71,7 @@ export default function BalanceWithCarryover({
           <ArrowThinRight
             width={7}
             height={7}
-            style={makeAmountStyle(balanceValue)}
+            style={makeAmountStyle(balanceValue, goalValue, budgetedValue)}
           />
         </View>
       )}

diff --git a/packages/desktop-client/src/components/budget/MobileBudgetTable.js b/packages/desktop-client/src/components/budget/MobileBudgetTable.js
@@ -446,6 +446,8 @@ const ExpenseCategory = memo(function ExpenseCategory({
             <BalanceWithCarryover
               carryover={rolloverBudget.catCarryover(category.id)}
               balance={rolloverBudget.catBalance(category.id)}
+              goal={reportBudget.catGoal(category.id)}
+              budgeted={reportBudget.catBudgeted(category.id)}
               balanceStyle={{
                 ...styles.smallText,
                 ...styles.underlinedText,

diff --git a/packages/desktop-client/src/components/budget/report/components.tsx b/packages/desktop-client/src/components/budget/report/components.tsx
@@ -369,6 +369,8 @@ export const CategoryMonth = memo(function CategoryMonth({
               disabled={category.is_income}
               carryover={reportBudget.catCarryover(category.id)}
               balance={reportBudget.catBalance(category.id)}
+              goal={reportBudget.catGoal(category.id)}
+              budgeted={reportBudget.catBudgeted(category.id)}
             />
           </span>
           {balanceTooltip.isOpen && (

diff --git a/packages/desktop-client/src/components/budget/rollover/rollover-components.tsx b/packages/desktop-client/src/components/budget/rollover/rollover-components.tsx
@@ -320,6 +320,8 @@ export const ExpenseCategoryMonth = memo(function ExpenseCategoryMonth({
           <BalanceWithCarryover
             carryover={rolloverBudget.catCarryover(category.id)}
             balance={rolloverBudget.catBalance(category.id)}
+            goal={rolloverBudget.catGoal(category.id)}
+            budgeted={rolloverBudget.catBudgeted(category.id)}
           />
         </span>
         {balanceTooltip.isOpen && (

diff --git a/packages/desktop-client/src/components/budget/util.ts b/packages/desktop-client/src/components/budget/util.ts
@@ -37,15 +37,26 @@ export function makeAmountGrey(value: number | string) {
     : null;
 }
 
-export function makeAmountStyle(value: number) {
-  const greyed = makeAmountGrey(value);
-  if (greyed) {
-    return greyed;
-  }
-
+export function makeAmountStyle(
+  value: number,
+  goalValue?: number,
+  budgetedValue?: number,
+) {
   if (value < 0) {
     return { color: theme.errorText };
   }
+
+  if (goalValue == null) {
+    const greyed = makeAmountGrey(value);
+    if (greyed) {
+      return greyed;
+    }
+  } else {
+    if (budgetedValue < goalValue) {
+      return { color: theme.warningText };
+    }
+    return { color: theme.noticeText };
+  }
 }
 
 export function makeAmountFullStyle(value: number) {

diff --git a/packages/desktop-client/src/components/modals/ImportTransactions.js b/packages/desktop-client/src/components/modals/ImportTransactions.js
@@ -43,6 +43,18 @@ export function parseDate(str, order) {
 
   const dateGroups = (a, b) => str => {
     const parts = str
+      .replace(/\bjan(\.|uary)?\b/i, '01')
+      .replace(/\bfeb(\.|ruary)?\b/i, '02')
+      .replace(/\bmar(\.|ch)?\b/i, '03')
+      .replace(/\bapr(\.|il)?\b/i, '04')
+      .replace(/\bmay\.?\b/i, '05')
+      .replace(/\bjun(\.|e)?\b/i, '06')
+      .replace(/\bjul(\.|y)?\b/i, '07')
+      .replace(/\baug(\.|ust)?\b/i, '08')
+      .replace(/\bsep(\.|tember)?\b/i, '09')
+      .replace(/\boct(\.|ober)?\b/i, '10')
+      .replace(/\bnov(\.|ember)?\b/i, '11')
+      .replace(/\bdec(\.|ember)?\b/i, '12')
       .replace(/^[^\d]+/, '')
       .replace(/[^\d]+$/, '')
       .split(/[^\d]+/);

diff --git a/packages/desktop-client/src/components/modals/ImportTransactions.test.js b/packages/desktop-client/src/components/modals/ImportTransactions.test.js
@@ -8,8 +8,9 @@ describe('Import transactions', function () {
       { str: 42, order: 'yyyy mm dd' },
       { str: {}, order: 'yyyy mm dd' },
       { str: [], order: 'yyyy mm dd' },
+      { str: 'Decimal 24 2020', order: 'mm dd yyyy' },
+      { str: '24 aDec 2020', order: 'dd mm yyyy' },
       { str: 'invalid', order: 'yyyy mm dd' },
-      { str: '2020 Dec 24', order: 'yyyy mm dd' },
       { str: '12 24 20', order: 'mm dd yyyy' },
       { str: '20 12 24', order: 'yyyy mm dd' },
       { str: '2020 12 24', order: 'yy mm dd' },
@@ -40,6 +41,9 @@ describe('Import transactions', function () {
       {
         order: 'yyyy mm dd',
         cases: [
+          ['2020 Dec 24', '2020-12-24'],
+          ['2020 Dec. 24', '2020-12-24'],
+          ['2020 December 24', '2020-12-24'],
           ['20201224', '2020-12-24'],
           ['2020 12 24', '2020-12-24'],
           ['2020-1-2', '2020-01-02'],
@@ -54,6 +58,9 @@ describe('Import transactions', function () {
       {
         order: 'yy mm dd',
         cases: [
+          ['20 Dec 24', '2020-12-24'],
+          ['20 Dec. 24', '2020-12-24'],
+          ['20 December 24', '2020-12-24'],
           ['201224', '2020-12-24'],
           ['20 12 24', '2020-12-24'],
           ['20-12-24', '2020-12-24'],
@@ -67,6 +74,9 @@ describe('Import transactions', function () {
       {
         order: 'mm dd yyyy',
         cases: [
+          ['Dec 24, 2020', '2020-12-24'],
+          ['Dec. 24, 2020', '2020-12-24'],
+          ['December 24, 2020', '2020-12-24'],
           ['12242020', '2020-12-24'],
           ['1 24 2020', '2020-01-24'],
           ['01 24 2020', '2020-01-24'],
@@ -81,6 +91,9 @@ describe('Import transactions', function () {
       {
         order: 'mm dd yy',
         cases: [
+          ['Dec 24, 20', '2020-12-24'],
+          ['Dec. 24, 20', '2020-12-24'],
+          ['December 24, 20', '2020-12-24'],
           ['122420', '2020-12-24'],
           ['12 24 20 ', '2020-12-24'],
           ['12-24-20', '2020-12-24'],
@@ -96,6 +109,9 @@ describe('Import transactions', function () {
       {
         order: 'dd mm yyyy',
         cases: [
+          ['24 Dec 2020', '2020-12-24'],
+          ['24 Dec. 2020', '2020-12-24'],
+          ['24 December 2020', '2020-12-24'],
           ['24122020', '2020-12-24'],
           ['24 12 2020 ', '2020-12-24'],
           ['2 12 2020', '2020-12-02'],
@@ -112,6 +128,9 @@ describe('Import transactions', function () {
       {
         order: 'dd mm yy',
         cases: [
+          ['24 Dec 20', '2020-12-24'],
+          ['24 Dec. 20', '2020-12-24'],
+          ['24 December 20', '2020-12-24'],
           ['241220', '2020-12-24'],
           ['2412 20 ', '2020-12-24'],
           ['24-12-20', '2020-12-24'],

diff --git a/packages/desktop-client/src/hooks/useSelected.tsx b/packages/desktop-client/src/hooks/useSelected.tsx
@@ -53,6 +53,7 @@ export default function useSelected<T extends Item>(
   name: string,
   items: T[],
   initialSelectedIds: string[],
+  selectAllFilter?: (T) => boolean,
 ) {
   let [state, dispatch] = useReducer(
     (state: State, action: Actions) => {
@@ -128,9 +129,20 @@ export default function useSelected<T extends Item>(
           return { ...state, selectedItems: new Set<string>() };
 
         case 'select-all':
+          let selectedItems: string[] = [];
+          if (action.ids && items && selectAllFilter) {
+            const idsToInclude = new Set(
+              items.filter(selectAllFilter).map(item => item.id),
+            );
+            selectedItems = action.ids.filter(id => idsToInclude.has(id));
+          } else if (items && selectAllFilter) {
+            selectedItems = items.filter(selectAllFilter).map(item => item.id);
+          } else {
+            selectedItems = action.ids || items.map(item => item.id);
+          }
           return {
             ...state,
-            selectedItems: new Set(action.ids || items.map(item => item.id)),
+            selectedItems: new Set(selectedItems),
             selectedRange:
               action.ids && action.ids.length === 1
                 ? { start: action.ids[0], end: null }
@@ -300,6 +312,7 @@ type SelectedProviderWithItemsProps<T extends Item> = {
   initialSelectedIds: string[];
   fetchAllIds: () => Promise<string[]>;
   registerDispatch?: (dispatch: Dispatch<Actions>) => void;
+  selectAllFilter?: (T) => boolean;
   children: ReactElement;
 };
 
@@ -311,9 +324,15 @@ export function SelectedProviderWithItems<T extends Item>({
   initialSelectedIds,
   fetchAllIds,
   registerDispatch,
+  selectAllFilter,
   children,
 }: SelectedProviderWithItemsProps<T>) {
-  let selected = useSelected<T>(name, items, initialSelectedIds);
+  let selected = useSelected<T>(
+    name,
+    items,
+    initialSelectedIds,
+    selectAllFilter,
+  );
 
   useEffect(() => {
     registerDispatch?.(selected.dispatch);

diff --git a/packages/loot-core/migrations/1694438752000_add_goal_targets.sql b/packages/loot-core/migrations/1694438752000_add_goal_targets.sql
@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE zero_budgets ADD column goal INTEGER DEFAULT null;
+ALTER TABLE reflect_budgets ADD column goal INTEGER DEFAULT null;
+ALTER TABLE categories ADD column goal_def TEXT DEFAULT null;
+
+COMMIT;
diff --git a/packages/loot-core/src/client/queries.ts b/packages/loot-core/src/client/queries.ts
@@ -177,6 +177,7 @@ export const rolloverBudget = {
   catSumAmount: id => `sum-amount-${id}`,
   catBalance: id => `leftover-${id}`,
   catCarryover: id => `carryover-${id}`,
+  catGoal: id => `goal-${id}`,
 };
 
 export const reportBudget = {
@@ -199,4 +200,5 @@ export const reportBudget = {
   catSumAmount: id => `sum-amount-${id}`,
   catBalance: id => `leftover-${id}`,
   catCarryover: id => `carryover-${id}`,
+  catGoal: id => `goal-${id}`,
 };
diff --git a/packages/loot-core/src/server/budget/actions.ts b/packages/loot-core/src/server/budget/actions.ts
@@ -113,6 +113,24 @@ export function setBudget({
   });
 }
 
+export function setGoal({ month, category, goal }): Promise<void> {
+  const table = getBudgetTable();
+  let existing = db.firstSync(
+    `SELECT id FROM ${table} WHERE month = ? AND category = ?`,
+    [dbMonth(month), category],
+  );
+  if (existing) {
+    return db.update(table, {
+      id: existing.id,
+      goal: goal,
+    });
+  }
+  return db.insert(table, {
+    id: month,
+    goal: goal,
+  });
+}
+
 export function setBuffer(month: string, amount: unknown): Promise<void> {
   let existing = db.firstSync(
     `SELECT id FROM zero_budget_months WHERE id = ?`,

diff --git a/packages/loot-core/src/server/budget/base.ts b/packages/loot-core/src/server/budget/base.ts
@@ -318,6 +318,7 @@ function handleBudgetChange(budget) {
         `${sheetName}!carryover-${budget.category}`,
         budget.carryover === 1 ? true : false,
       );
+    sheet.get().set(`${sheetName}!goal-${budget.category}`, budget.goal);
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -318,6 +318,7 @@ function handleBudgetChange(budget) { @@
             `${sheetName}!carryover-${budget.category}`,
             budget.carryover === 1 ? true : false,
           );
+        sheet.get().set(`${sheetName}!goal-${budget.category}`, budget.goal);
       }
     }
@@ Expand Down @@