A local-first personal finance app
Fix alignment of reports` (#3007)
Austin Pearceaa3cbd881b74
diff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.pngindex 5d70d3923a..f62d415999 100644Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-2-chromium-linux.pngindex a21db20c60..5d1c88fb7f 100644Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-3-chromium-linux.pngindex 2021bf6585..e3429c77e9 100644Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-and-cash-flow-reports-3-chromium-linux.png differdiff --git a/packages/desktop-client/src/components/reports/Overview.tsx b/packages/desktop-client/src/components/reports/Overview.tsxindex b2714d154a..34fb1b17ac 100644--- a/packages/desktop-client/src/components/reports/Overview.tsx+++ b/packages/desktop-client/src/components/reports/Overview.tsx@@ -1,6 +1,8 @@import React from 'react';import { useLocation } from 'react-router-dom';+import { css } from 'glamor';+import { useReports } from 'loot-core/src/client/data-hooks/reports';import { useAccounts } from '../../hooks/useAccounts';@@ -56,16 +58,21 @@ export function Overview() {style={{ paddingBottom: MOBILE_NAV_HEIGHT }}><View- style={{- flexDirection: isNarrowWidth ? 'column' : 'row',+ className={`${css({flex: '0 0 auto',- }}+ flexDirection: isNarrowWidth ? 'column' : 'row',+ flexWrap: isNarrowWidth ? 'nowrap' : 'wrap',+ padding: '10',+ '> a, > div': {+ margin: '10',+ },+ })}`}><NetWorthCard accounts={accounts} /><CashFlowCard />{spendingReportFeatureFlag && <SpendingCard />}+ <CustomReportListCards reports={customReports} /></View>- <CustomReportListCards reports={customReports} /></Page>);}diff --git a/packages/desktop-client/src/components/reports/ReportCard.tsx b/packages/desktop-client/src/components/reports/ReportCard.tsxindex fb69523ab4..08e2bcf646 100644--- a/packages/desktop-client/src/components/reports/ReportCard.tsx+++ b/packages/desktop-client/src/components/reports/ReportCard.tsx@@ -2,6 +2,7 @@ import React, { type ReactNode } from 'react';import { type CustomReportEntity } from 'loot-core/src/types/models';+import { useResponsive } from '../../ResponsiveProvider';import { type CSSProperties, theme } from '../../style';import { Link } from '../common/Link';import { View } from '../common/View';@@ -10,7 +11,7 @@ type ReportCardProps = {to: string;children: ReactNode;report?: CustomReportEntity;- flex?: string;+ size?: number;style?: CSSProperties;};@@ -18,10 +19,13 @@ export function ReportCard({to,report,children,- flex,+ size = 1,style,}: ReportCardProps) {- const containerProps = { flex, margin: 15 };+ const { isNarrowWidth } = useResponsive();+ const containerProps = {+ flex: isNarrowWidth ? '1 1' : `0 0 calc(${size * 100}% / 3 - 20px)`,+ };const content = (<Viewdiff --git a/packages/desktop-client/src/components/reports/reports/CashFlowCard.jsx b/packages/desktop-client/src/components/reports/reports/CashFlowCard.jsxindex ae376b2c5c..7d54f04548 100644--- a/packages/desktop-client/src/components/reports/reports/CashFlowCard.jsx+++ b/packages/desktop-client/src/components/reports/reports/CashFlowCard.jsx@@ -83,7 +83,7 @@ export function CashFlowCard() {const income = graphData?.income || 0;return (- <ReportCard flex={1} to="/reports/cash-flow">+ <ReportCard to="/reports/cash-flow"><Viewstyle={{ flex: 1 }}onPointerEnter={onCardHover}diff --git a/packages/desktop-client/src/components/reports/reports/CustomReportListCards.tsx b/packages/desktop-client/src/components/reports/reports/CustomReportListCards.tsxindex 4b7034602a..bfc998b208 100644--- a/packages/desktop-client/src/components/reports/reports/CustomReportListCards.tsx+++ b/packages/desktop-client/src/components/reports/reports/CustomReportListCards.tsx@@ -1,4 +1,4 @@-import React, { useEffect, useMemo, useState } from 'react';+import React, { useEffect, useState } from 'react';import { send, sendCatch } from 'loot-core/platform/client/fetch/index';import * as monthUtils from 'loot-core/src/shared/months';@@ -47,9 +47,9 @@ export function CustomReportListCards({const payees = usePayees();const accounts = useAccounts();const categories = useCategories();- const { isNarrowWidth } = useResponsive();const [_firstDayOfWeekIdx] = useLocalPref('firstDayOfWeekIdx');const firstDayOfWeekIdx = _firstDayOfWeekIdx || '0';+ const { isNarrowWidth } = useResponsive();const [isCardHovered, setIsCardHovered] = useState('');@@ -118,137 +118,90 @@ export function CustomReportListCards({setNameMenuOpen({ ...nameMenuOpen, [item]: state });};- const chunkSize = 3;-- const groups = useMemo(() => {- return reports- .map((report: CustomReportEntity, i: number) => {- return i % chunkSize === 0 ? reports.slice(i, i + chunkSize) : null;- })- .filter(e => {- return e;- });- }, [reports]);-- const remainder = 3 - (reports.length % 3);-if (reports.length === 0) return null;return (- <View>- {groups.map((group, i) => (+ <>+ {reports.map((report, id) => (<View- key={i}+ key={id}style={{- flex: '0 0 auto',- flexDirection: isNarrowWidth ? 'column' : 'row',+ flex: isNarrowWidth ? '1 1' : `0 0 calc(100% / 3 - 20px)`,}}>- {group &&- group.map((report, id) => (+ <ReportCard to="/reports/custom" report={report}>+ <View+ style={{ flex: 1, padding: 10 }}+ onMouseEnter={() =>+ setIsCardHovered(report.id === undefined ? '' : report.id)+ }+ onMouseLeave={() => {+ setIsCardHovered('');+ onMenuOpen(report.id === undefined ? '' : report.id, false);+ }}+ ><View- key={id}- style={- !isNarrowWidth- ? {- position: 'relative',- flex: '1',- }- : {- position: 'relative',- }- }+ style={{+ flexShrink: 0,+ paddingBottom: 5,+ }}>- <View style={{ width: '100%', height: '100%' }}>- <ReportCard to="/reports/custom" report={report}>- <View- style={{ flex: 1, padding: 10 }}- onMouseEnter={() =>- setIsCardHovered(- report.id === undefined ? '' : report.id,- )- }- onMouseLeave={() => {- setIsCardHovered('');- onMenuOpen(- report.id === undefined ? '' : report.id,- false,- );- }}- >- <View- style={{- flexShrink: 0,- paddingBottom: 5,- }}- >- <View style={{ flex: 1 }}>- <Block- style={{- ...styles.mediumText,- fontWeight: 500,- marginBottom: 5,- }}- role="heading"- >- {report.name}- </Block>- {report.isDateStatic ? (- <DateRange- start={report.startDate}- end={report.endDate}- />- ) : (- <Text style={{ color: theme.pageTextSubdued }}>- {report.dateRange}- </Text>- )}- </View>- </View>- <GetCardData- report={report}- payees={payees}- accounts={accounts}- categories={categories}- earliestTransaction={earliestTransaction}- firstDayOfWeekIdx={firstDayOfWeekIdx}- />- </View>- </ReportCard>- </View>- <View- style={{- textAlign: 'right',- position: 'absolute',- right: 25,- top: 25,- }}- >- <ListCardsPopover- report={report}- onMenuOpen={onMenuOpen}- isCardHovered={isCardHovered}- reportMenu={reportMenu}- onMenuSelect={onMenuSelect}- nameMenuOpen={nameMenuOpen}- name={name}- setName={setName}- onAddUpdate={onAddUpdate}- err={err}- onNameMenuOpen={onNameMenuOpen}- deleteMenuOpen={deleteMenuOpen}- onDeleteMenuOpen={onDeleteMenuOpen}- onDelete={onDelete}- />+ <View style={{ flex: 1 }}>+ <Block+ style={{+ ...styles.mediumText,+ fontWeight: 500,+ marginBottom: 5,+ }}+ role="heading"+ >+ {report.name}+ </Block>+ {report.isDateStatic ? (+ <DateRange start={report.startDate} end={report.endDate} />+ ) : (+ <Text style={{ color: theme.pageTextSubdued }}>+ {report.dateRange}+ </Text>+ )}</View></View>- ))}- {remainder !== 3 &&- i + 1 === groups.length &&- [...Array(remainder)].map((e, i) => (- <View key={i} style={{ flex: 1 }} />- ))}+ <GetCardData+ report={report}+ payees={payees}+ accounts={accounts}+ categories={categories}+ earliestTransaction={earliestTransaction}+ firstDayOfWeekIdx={firstDayOfWeekIdx}+ />+ </View>+ </ReportCard>+ <View+ style={{+ textAlign: 'right',+ position: 'absolute',+ right: 10,+ top: 10,+ }}+ >+ <ListCardsPopover+ report={report}+ onMenuOpen={onMenuOpen}+ isCardHovered={isCardHovered}+ reportMenu={reportMenu}+ onMenuSelect={onMenuSelect}+ nameMenuOpen={nameMenuOpen}+ name={name}+ setName={setName}+ onAddUpdate={onAddUpdate}+ err={err}+ onNameMenuOpen={onNameMenuOpen}+ deleteMenuOpen={deleteMenuOpen}+ onDeleteMenuOpen={onDeleteMenuOpen}+ onDelete={onDelete}+ />+ </View></View>))}- </View>+ </>);}diff --git a/packages/desktop-client/src/components/reports/reports/NetWorthCard.jsx b/packages/desktop-client/src/components/reports/reports/NetWorthCard.jsxindex dc0ca1964d..c318690ec7 100644--- a/packages/desktop-client/src/components/reports/reports/NetWorthCard.jsx+++ b/packages/desktop-client/src/components/reports/reports/NetWorthCard.jsx@@ -29,7 +29,7 @@ export function NetWorthCard({ accounts }) {const data = useReport('net_worth', params);return (- <ReportCard flex={2} to="/reports/net-worth">+ <ReportCard size={2} to="/reports/net-worth"><Viewstyle={{ flex: 1 }}onPointerEnter={onCardHover}diff --git a/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx b/packages/desktop-client/src/components/reports/reports/SpendingCard.tsxindex d999494ed9..2796261d1c 100644--- a/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx+++ b/packages/desktop-client/src/components/reports/reports/SpendingCard.tsx@@ -39,7 +39,7 @@ export function SpendingCard() {const showLastMonth = data && Math.abs(data.intervalData[27].lastMonth) > 0;return (- <ReportCard flex="1" to="/reports/spending">+ <ReportCard to="/reports/spending"><Viewstyle={{ flex: 1 }}onPointerEnter={() => setIsCardHovered(true)}diff --git a/upcoming-release-notes/3007.md b/upcoming-release-notes/3007.mdnew file mode 100644index 0000000000..c879b21979--- /dev/null+++ b/upcoming-release-notes/3007.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [JukeboxRhino]+---++Fix alignment of reports