A local-first personal finance app
Custom Reports Adjustments (#2659)
Neild49f907f5384
diff --git a/packages/desktop-client/src/components/filters/AppliedFilters.tsx b/packages/desktop-client/src/components/filters/AppliedFilters.tsxindex 930d319276..538bdd72b7 100644--- a/packages/desktop-client/src/components/filters/AppliedFilters.tsx+++ b/packages/desktop-client/src/components/filters/AppliedFilters.tsx@@ -12,7 +12,7 @@ type AppliedFiltersProps = {onUpdate: (filter: RuleConditionEntity,newFilter: RuleConditionEntity,- ) => RuleConditionEntity;+ ) => void;onDelete: (filter: RuleConditionEntity) => void;conditionsOp: string;onCondOpChange: (value: string, filters: RuleConditionEntity[]) => void;diff --git a/packages/desktop-client/src/components/filters/FilterExpression.tsx b/packages/desktop-client/src/components/filters/FilterExpression.tsxindex 08bb156456..5a258e9514 100644--- a/packages/desktop-client/src/components/filters/FilterExpression.tsx+++ b/packages/desktop-client/src/components/filters/FilterExpression.tsx@@ -24,7 +24,7 @@ type FilterExpressionProps = {value: string | string[] | number | boolean | undefined;options: RuleConditionEntity['options'];style?: CSSProperties;- onChange: (cond: RuleConditionEntity) => RuleConditionEntity;+ onChange: (cond: RuleConditionEntity) => void;onDelete: () => void;};diff --git a/packages/desktop-client/src/components/filters/FiltersMenu.jsx b/packages/desktop-client/src/components/filters/FiltersMenu.jsxindex 18889c5159..db8459deb7 100644--- a/packages/desktop-client/src/components/filters/FiltersMenu.jsx+++ b/packages/desktop-client/src/components/filters/FiltersMenu.jsx@@ -243,7 +243,7 @@ function ConfigureField({);}-export function FilterButton({ onApply, compact, hover }) {+export function FilterButton({ onApply, compact, hover, exclude }) {const filters = useFilters();const dateFormat = useDateFormat() || 'MM/dd/yyyy';@@ -359,10 +359,12 @@ export function FilterButton({ onApply, compact, hover }) {onMenuSelect={name => {dispatch({ type: 'configure', field: name });}}- items={filterFields.map(([name, text]) => ({- name,- text: titleFirst(text),- }))}+ items={filterFields+ .filter(f => (exclude ? !exclude.includes(f[0]) : true))+ .map(([name, text]) => ({+ name,+ text: titleFirst(text),+ }))}/></Tooltip>)}diff --git a/packages/desktop-client/src/components/filters/FiltersStack.tsx b/packages/desktop-client/src/components/filters/FiltersStack.tsxindex 055fd110c6..3d050ec44a 100644--- a/packages/desktop-client/src/components/filters/FiltersStack.tsx+++ b/packages/desktop-client/src/components/filters/FiltersStack.tsx@@ -27,7 +27,7 @@ export function FiltersStack({onUpdateFilter: (filter: RuleConditionEntity,newFilter: RuleConditionEntity,- ) => RuleConditionEntity;+ ) => void;onDeleteFilter: (filter: RuleConditionEntity) => void;onClearFilters: () => void;onReloadSavedFilter: (savedFilter: SavedFilter, value?: string) => void;diff --git a/packages/desktop-client/src/components/reports/Change.jsx b/packages/desktop-client/src/components/reports/Change.tsxsimilarity index 58%rename from packages/desktop-client/src/components/reports/Change.jsxrename to packages/desktop-client/src/components/reports/Change.tsxindex 5267b2c77c..8c4c429e7f 100644--- a/packages/desktop-client/src/components/reports/Change.jsx+++ b/packages/desktop-client/src/components/reports/Change.tsx@@ -2,15 +2,24 @@ import React from 'react';import { integerToCurrency } from 'loot-core/src/shared/util';-import { theme, styles } from '../../style';+import { styles } from '../../style/styles';+import { theme } from '../../style/theme';+import { type CSSProperties } from '../../style/types';import { Block } from '../common/Block';-export function Change({ amount }) {+export function Change({+ amount,+ style,+}: {+ amount: number;+ style?: CSSProperties;+}) {return (<Blockstyle={{...styles.smallText,color: amount < 0 ? theme.errorText : theme.noticeTextLight,+ ...style,}}>{amount >= 0 ? '+' : ''}diff --git a/packages/desktop-client/src/components/reports/ModeButton.tsx b/packages/desktop-client/src/components/reports/ModeButton.tsxindex 70b00bef7f..503d9692e1 100644--- a/packages/desktop-client/src/components/reports/ModeButton.tsx+++ b/packages/desktop-client/src/components/reports/ModeButton.tsx@@ -6,7 +6,7 @@ import { Button } from '../common/Button';type ModeButtonProps = {selected: boolean;children: ReactNode;- style: CSSProperties;+ style?: CSSProperties;onSelect: MouseEventHandler<HTMLButtonElement>;};diff --git a/packages/desktop-client/src/components/reports/ReportCard.tsx b/packages/desktop-client/src/components/reports/ReportCard.tsxindex 41278b3942..fb69523ab4 100644--- a/packages/desktop-client/src/components/reports/ReportCard.tsx+++ b/packages/desktop-client/src/components/reports/ReportCard.tsx@@ -8,8 +8,8 @@ import { View } from '../common/View';type ReportCardProps = {to: string;- report: CustomReportEntity;children: ReactNode;+ report?: CustomReportEntity;flex?: string;style?: CSSProperties;};diff --git a/packages/desktop-client/src/components/reports/reports/CashFlowCard.jsx b/packages/desktop-client/src/components/reports/reports/CashFlowCard.jsxindex ed8daeb6af..a5984b82c5 100644--- a/packages/desktop-client/src/components/reports/reports/CashFlowCard.jsx+++ b/packages/desktop-client/src/components/reports/reports/CashFlowCard.jsx@@ -102,10 +102,7 @@ export function CashFlowCard() {{data && (<View style={{ textAlign: 'right' }}><PrivacyFilter activationFilters={[!isCardHovered]}>- <Change- amount={income - expenses}- style={{ color: theme.tableText, fontWeight: 300 }}- />+ <Change amount={income - expenses} /></PrivacyFilter></View>)}diff --git a/packages/desktop-client/src/components/reports/reports/NetWorthCard.jsx b/packages/desktop-client/src/components/reports/reports/NetWorthCard.jsxindex 3b2963bd4a..dc0ca1964d 100644--- a/packages/desktop-client/src/components/reports/reports/NetWorthCard.jsx+++ b/packages/desktop-client/src/components/reports/reports/NetWorthCard.jsx@@ -3,7 +3,7 @@ import React, { useState, useMemo, useCallback } from 'react';import * as monthUtils from 'loot-core/src/shared/months';import { integerToCurrency } from 'loot-core/src/shared/util';-import { theme, styles } from '../../../style';+import { styles } from '../../../style';import { Block } from '../../common/Block';import { View } from '../../common/View';import { PrivacyFilter } from '../../PrivacyFilter';@@ -59,10 +59,7 @@ export function NetWorthCard({ accounts }) {</PrivacyFilter></Block><PrivacyFilter activationFilters={[!isCardHovered]}>- <Change- amount={data.totalChange}- style={{ color: theme.tableText, fontWeight: 300 }}- />+ <Change amount={data.totalChange} /></PrivacyFilter></View>)}diff --git a/packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.tsindex 1f4569ccca..860efbc075 100644--- a/packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts+++ b/packages/desktop-client/src/components/reports/spreadsheets/custom-spreadsheet.ts@@ -110,7 +110,6 @@ export function createCustomSpreadsheet({startDate,endDate,interval,- selectedCategories,categoryFilter,conditionsOpKey,filters,@@ -122,7 +121,6 @@ export function createCustomSpreadsheet({startDate,endDate,interval,- selectedCategories,categoryFilter,conditionsOpKey,filters,diff --git a/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts b/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.tsindex b473e55775..da794cdfe3 100644--- a/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts+++ b/packages/desktop-client/src/components/reports/spreadsheets/grouped-spreadsheet.ts@@ -59,7 +59,6 @@ export function createGroupedSpreadsheet({startDate,endDate,interval,- selectedCategories,categoryFilter,conditionsOpKey,filters,@@ -71,7 +70,6 @@ export function createGroupedSpreadsheet({startDate,endDate,interval,- selectedCategories,categoryFilter,conditionsOpKey,filters,diff --git a/packages/desktop-client/src/components/reports/spreadsheets/makeQuery.ts b/packages/desktop-client/src/components/reports/spreadsheets/makeQuery.tsindex 986738eaee..f72964f35b 100644--- a/packages/desktop-client/src/components/reports/spreadsheets/makeQuery.ts+++ b/packages/desktop-client/src/components/reports/spreadsheets/makeQuery.ts@@ -8,7 +8,6 @@ export function makeQuery(startDate: string,endDate: string,interval: string,- selectedCategories: CategoryEntity[],categoryFilter: CategoryEntity[],conditionsOpKey: string,filters: unknown[],@@ -27,7 +26,7 @@ export function makeQuery(const query = q('transactions')//Apply Category_Selector.filter(- selectedCategories && {+ categoryFilter && {$or: [{category: null,@@ -66,6 +65,7 @@ export function makeQuery({ date: intervalGroup },{ category: { $id: '$category.id' } },{ categoryHidden: { $id: '$category.hidden' } },+ { categoryIncome: { $id: '$category.is_income' } },{ categoryGroup: { $id: '$category.group.id' } },{ categoryGroupHidden: { $id: '$category.group.hidden' } },{ account: { $id: '$account.id' } },diff --git a/packages/desktop-client/src/style/themes/dark.ts b/packages/desktop-client/src/style/themes/dark.tsindex 185b042e4f..d580e723ab 100644--- a/packages/desktop-client/src/style/themes/dark.ts+++ b/packages/desktop-client/src/style/themes/dark.ts@@ -188,5 +188,6 @@ export const pillBorderSelected = colorPalette.purple400;export const reportsRed = colorPalette.red300;export const reportsBlue = colorPalette.blue400;+export const reportsGreen = colorPalette.green400;export const reportsLabel = pageText;export const reportsInnerLabel = colorPalette.navy800;diff --git a/packages/desktop-client/src/style/themes/development.ts b/packages/desktop-client/src/style/themes/development.tsindex c8a47c85eb..c4f71d3df5 100644--- a/packages/desktop-client/src/style/themes/development.ts+++ b/packages/desktop-client/src/style/themes/development.ts@@ -187,4 +187,6 @@ export const pillBorderSelected = colorPalette.purple500;export const reportsRed = colorPalette.red300;export const reportsBlue = colorPalette.blue400;+export const reportsGreen = colorPalette.green400;export const reportsLabel = colorPalette.navy900;+export const reportsInnerLabel = colorPalette.navy800;diff --git a/packages/desktop-client/src/style/themes/light.ts b/packages/desktop-client/src/style/themes/light.tsindex 37549803de..294122cf31 100644--- a/packages/desktop-client/src/style/themes/light.ts+++ b/packages/desktop-client/src/style/themes/light.ts@@ -190,5 +190,6 @@ export const pillBorderSelected = colorPalette.purple500;export const reportsRed = colorPalette.red300;export const reportsBlue = colorPalette.blue400;+export const reportsGreen = colorPalette.green400;export const reportsLabel = colorPalette.navy900;export const reportsInnerLabel = colorPalette.navy800;diff --git a/packages/desktop-client/src/style/themes/midnight.ts b/packages/desktop-client/src/style/themes/midnight.tsindex 135194af82..9a6fc4fbe1 100644--- a/packages/desktop-client/src/style/themes/midnight.ts+++ b/packages/desktop-client/src/style/themes/midnight.ts@@ -190,4 +190,6 @@ export const pillBorderSelected = colorPalette.purple300;export const reportsRed = colorPalette.red300;export const reportsBlue = colorPalette.blue400;+export const reportsGreen = colorPalette.green400;export const reportsLabel = pageText;+export const reportsInnerLabel = colorPalette.navy800;diff --git a/packages/loot-core/src/shared/months.ts b/packages/loot-core/src/shared/months.tsindex 634324780a..6be72eddc8 100644--- a/packages/loot-core/src/shared/months.ts+++ b/packages/loot-core/src/shared/months.ts@@ -347,6 +347,10 @@ export function getMonth(day: string): string {return day.slice(0, 7);}+export function getDay(day: string): number {+ return Number(d.format(_parse(day), 'dd'));+}+export function getMonthEnd(day: string): string {return subDays(nextMonth(day.slice(0, 7)) + '-01', 1);}diff --git a/upcoming-release-notes/2659.md b/upcoming-release-notes/2659.mdnew file mode 100644index 0000000000..a509cc6894--- /dev/null+++ b/upcoming-release-notes/2659.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [carkom]+---++Some slight adjustments to tidy up the code and make it work better. Some TS updates as well.