Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mobile balance cover/transfer/rollover overspending #1802

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,20 @@ import React, {

import { css } from 'glamor';

import {
type CategoryEntity,
type CategoryGroupEntity,
} from 'loot-core/src/types/models';

import Split from '../../icons/v0/Split';
import { theme } from '../../style';
import Text from '../common/Text';
import View from '../common/View';

import Autocomplete, { defaultFilterSuggestion } from './Autocomplete';

export type Category = {
id: string;
cat_group: unknown;
groupName: string;
name: string;
};

export type CategoryGroup = {
id: string;
name: string;
categories: Array<Category>;
};

export type CategoryListProps = {
items: Array<Category>;
items: Array<CategoryEntity & { group?: CategoryGroupEntity }>;
getItemProps?: (arg: { item }) => Partial<ComponentProps<typeof View>>;
highlightedIndex: number;
embedded: boolean;
Expand Down Expand Up @@ -122,7 +114,7 @@ function CategoryList({
}}
data-testid="category-item-group"
>
{item.groupName}
{`${item.group?.name}`}
</div>
)}
<div
Expand Down Expand Up @@ -157,7 +149,7 @@ function CategoryList({
}

type CategoryAutocompleteProps = ComponentProps<typeof Autocomplete> & {
categoryGroups: CategoryGroup[];
categoryGroups: Array<CategoryGroupEntity>;
showSplitOption?: boolean;
groupHeaderStyle?: object;
};
Expand All @@ -169,19 +161,23 @@ export default function CategoryAutocomplete({
groupHeaderStyle,
...props
}: CategoryAutocompleteProps) {
let categorySuggestions = useMemo(
let categorySuggestions: Array<
CategoryEntity & { group?: CategoryGroupEntity }
> = useMemo(
() =>
categoryGroups.reduce(
(list, group) =>
list.concat(
group.categories.map(category => ({
...category,
groupName: group.name,
})),
group.categories
.filter(category => category.cat_group === group.id)
.map(category => ({
...category,
group: group,
})),
),
showSplitOption ? [{ id: 'split', name: '' }] : [],
showSplitOption ? [{ id: 'split', name: '' } as CategoryEntity] : [],
),
[categoryGroups],
[showSplitOption, categoryGroups],
);

return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { type ComponentProps } from 'react';

import ArrowThinRight from '../../icons/v1/ArrowThinRight';
import { type CSSProperties } from '../../style';
import View from '../common/View';
import CellValue from '../spreadsheet/CellValue';
import useSheetValue from '../spreadsheet/useSheetValue';
Expand All @@ -11,17 +12,23 @@ type BalanceWithCarryoverProps = {
carryover: ComponentProps<typeof CellValue>['binding'];
balance: ComponentProps<typeof CellValue>['binding'];
disabled?: boolean;
style?: CSSProperties;
balanceStyle?: CSSProperties;
carryoverStyle?: CSSProperties;
};
export default function BalanceWithCarryover({
carryover,
balance,
disabled,
style,
balanceStyle,
carryoverStyle,
}: BalanceWithCarryoverProps) {
let carryoverValue = useSheetValue(carryover);
let balanceValue = useSheetValue(balance);

return (
<>
<View style={style}>
<CellValue
binding={balance}
type="financial"
Expand All @@ -32,9 +39,10 @@ export default function BalanceWithCarryover({
cursor: 'pointer',
':hover': { textDecoration: 'underline' },
}),
...balanceStyle,
}}
/>
{carryoverValue === true && (
{carryoverValue && (
<View
style={{
alignSelf: 'center',
Expand All @@ -44,6 +52,7 @@ export default function BalanceWithCarryover({
top: 0,
bottom: 0,
justifyContent: 'center',
...carryoverStyle,
}}
>
<ArrowThinRight
Expand All @@ -53,6 +62,6 @@ export default function BalanceWithCarryover({
/>
</View>
)}
</>
</View>
);
}

This file was deleted.

57 changes: 27 additions & 30 deletions packages/desktop-client/src/components/budget/DynamicBudgetTable.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import View from '../common/View';
import { useBudgetMonthCount } from './BudgetMonthCountContext';
import BudgetPageHeader from './BudgetPageHeader';
import BudgetTable from './BudgetTable';
import { CategoryGroupsContext } from './CategoryGroupsContext';

function getNumPossibleMonths(width) {
let estimatedTableWidth = width - 200;
Expand Down Expand Up @@ -61,36 +60,34 @@ const DynamicBudgetTableInner = forwardRef(
}

return (
<CategoryGroupsContext.Provider value={categoryGroups}>
<View
style={{
width,
height,
alignItems: 'center',
opacity: width <= 0 || height <= 0 ? 0 : 1,
}}
>
<View style={{ width: '100%', maxWidth }}>
<BudgetPageHeader
startMonth={prewarmStartMonth}
numMonths={numMonths}
monthBounds={monthBounds}
onMonthSelect={onMonthSelect}
/>
<BudgetTable
ref={ref}
categoryGroups={categoryGroups}
prewarmStartMonth={prewarmStartMonth}
startMonth={startMonth}
numMonths={numMonths}
monthBounds={monthBounds}
prefs={prefs}
{...actions}
{...props}
/>
</View>
<View
style={{
width,
height,
alignItems: 'center',
opacity: width <= 0 || height <= 0 ? 0 : 1,
}}
>
<View style={{ width: '100%', maxWidth }}>
<BudgetPageHeader
startMonth={prewarmStartMonth}
numMonths={numMonths}
monthBounds={monthBounds}
onMonthSelect={onMonthSelect}
/>
<BudgetTable
ref={ref}
categoryGroups={categoryGroups}
prewarmStartMonth={prewarmStartMonth}
startMonth={startMonth}
numMonths={numMonths}
monthBounds={monthBounds}
prefs={prefs}
{...actions}
{...props}
/>
</View>
</CategoryGroupsContext.Provider>
</View>
);
},
);
Expand Down
Loading