A local-first personal finance app
Move “Manage Rules” to be primarily a page
Jed Fox0f2e3516b2b0
diff --git a/packages/desktop-client/src/components/FinancesApp.js b/packages/desktop-client/src/components/FinancesApp.jsindex f28507d190..988f58fa28 100644--- a/packages/desktop-client/src/components/FinancesApp.js+++ b/packages/desktop-client/src/components/FinancesApp.js@@ -35,6 +35,7 @@ import Settings from './Settings';import Modals from './Modals';import Notifications from './Notifications';import GlobalKeys from './GlobalKeys';+import { ManageRulesPage } from './ManageRulesPage';// import Debugger from './Debugger';function URLBar() {@@ -96,6 +97,7 @@ function Routes({ location }) {component={PostsOfflineNotification}/>+ <Route path="/rules" exact component={ManageRulesPage} /><Route path="/tools/fix-splits" exact component={FixSplitsTool} /><Routediff --git a/packages/desktop-client/src/components/modals/ManageRules.js b/packages/desktop-client/src/components/ManageRules.jssimilarity index 85%rename from packages/desktop-client/src/components/modals/ManageRules.jsrename to packages/desktop-client/src/components/ManageRules.jsindex 61f89bb3e4..00a6f18088 100644--- a/packages/desktop-client/src/components/modals/ManageRules.js+++ b/packages/desktop-client/src/components/ManageRules.js@@ -40,6 +40,7 @@ import {getRecurringDescription} from 'loot-core/src/shared/schedules';import { getPayeesById } from 'loot-core/src/client/reducers/queries';+import { Page } from './Page';let SchedulesQuery = liveQueryContext(q('schedules').select('*'));@@ -446,7 +447,7 @@ function RulesHeader() {let dispatchSelected = useSelectedDispatch();return (- <TableHeader>+ <TableHeader version="v2" style={{}}><SelectCellexposed={true}focused={false}@@ -498,14 +499,13 @@ function RulesList({);}-export default function ManageRules({ history, modalProps, payeeId }) {+export default function ManageRules({ payeeId, setLoading = () => {} }) {let [allRules, setAllRules] = useState(null);let [rules, setRules] = useState(null);let dispatch = useDispatch();let navigator = useTableNavigator(rules, ['select', 'edit']);let selectedInst = useSelected('manage-rules', allRules, []);let [hoveredRule, setHoveredRule] = useState(null);- let [loading, setLoading] = useState(true);let tableRef = useRef(null);async function loadRules() {@@ -619,88 +619,78 @@ export default function ManageRules({ history, modalProps, payeeId }) {}return (- <Modal- title="Rules"- padding={0}- loading={loading}- {...modalProps}- style={[modalProps.style, { flex: 1, maxWidth: '90%' }]}- >- {() => (- <SchedulesQuery.Provider>- <SelectedProvider instance={selectedInst}>- <View style={{ height: '70vh' }}>- <View style={{ flex: 1 }}>- <RulesHeader />- <SimpleTable- ref={tableRef}- data={rules}- navigator={navigator}- loadMore={loadMore}- // Hide the last border of the item in the table- style={{ marginBottom: -1 }}- >- <RulesList- rules={rules}- selectedItems={selectedInst.items}- navigator={navigator}- hoveredRule={hoveredRule}- onHover={onHover}- onEditRule={onEditRule}- />- </SimpleTable>- </View>-- <View- style={{- flexDirection: 'row',- alignItems: 'center',- padding: '13px 15px',- borderTop: '1px solid ' + colors.border- }}- >- <View- style={{- color: colors.n4,- flexDirection: 'row',- alignItems: 'center',- width: '50%'- }}- >- <Text>- Rules are always run in the order that you see them.{' '}- <ExternalLink- asAnchor={true}- href="https://actualbudget.com/docs/other/rules/"- style={{ color: colors.n4 }}- >- Learn more- </ExternalLink>- </Text>- </View>-- <View style={{ flex: 1 }} />-- <Stack- direction="row"- align="center"- justify="flex-end"- spacing={2}+ <SchedulesQuery.Provider>+ <SelectedProvider instance={selectedInst}>+ <View style={{ marginTop: 20, overflow: 'hidden' }}>+ <View style={{ flex: 1 }}>+ <RulesHeader />+ <SimpleTable+ ref={tableRef}+ data={rules}+ navigator={navigator}+ loadMore={loadMore}+ // Hide the last border of the item in the table+ style={{ marginBottom: -1 }}+ >+ <RulesList+ rules={rules}+ selectedItems={selectedInst.items}+ navigator={navigator}+ hoveredRule={hoveredRule}+ onHover={onHover}+ onEditRule={onEditRule}+ />+ </SimpleTable>+ </View>++ <View+ style={{+ flexDirection: 'row',+ alignItems: 'center',+ padding: '13px 15px',+ borderTop: '1px solid ' + colors.border+ }}+ >+ <View+ style={{+ color: colors.n4,+ flexDirection: 'row',+ alignItems: 'center',+ width: '50%'+ }}+ >+ <Text>+ Rules are always run in the order that you see them.{' '}+ <ExternalLink+ asAnchor={true}+ href="https://actualbudget.com/docs/other/rules/"+ style={{ color: colors.n4 }}>- {selectedInst.items.size > 0 && (- <Button onClick={onDeleteSelected}>- Delete {selectedInst.items.size} rules- </Button>- )}- <Button primary onClick={onCreateRule}>- Create new rule- </Button>- </Stack>- </View>+ Learn more+ </ExternalLink>+ </Text></View>- </SelectedProvider>- </SchedulesQuery.Provider>- )}- </Modal>++ <View style={{ flex: 1 }} />++ <Stack+ direction="row"+ align="center"+ justify="flex-end"+ spacing={2}+ >+ {selectedInst.items.size > 0 && (+ <Button onClick={onDeleteSelected}>+ Delete {selectedInst.items.size} rules+ </Button>+ )}+ <Button primary onClick={onCreateRule}>+ Create new rule+ </Button>+ </Stack>+ </View>+ </View>+ </SelectedProvider>+ </SchedulesQuery.Provider>);}diff --git a/packages/desktop-client/src/components/ManageRulesPage.js b/packages/desktop-client/src/components/ManageRulesPage.jsnew file mode 100644index 0000000000..664468b7ea--- /dev/null+++ b/packages/desktop-client/src/components/ManageRulesPage.js@@ -0,0 +1,11 @@+import React from 'react';+import ManageRules from './ManageRules';+import { Page } from './Page';++export function ManageRulesPage() {+ return (+ <Page title="Rules">+ <ManageRules />+ </Page>+ );+}diff --git a/packages/desktop-client/src/components/Modals.js b/packages/desktop-client/src/components/Modals.jsindex 5e756bbb38..ee029e6df0 100644--- a/packages/desktop-client/src/components/Modals.js+++ b/packages/desktop-client/src/components/Modals.js@@ -17,7 +17,7 @@ import ImportTransactions from 'loot-design/src/components/modals/ImportTransactimport EditField from 'loot-design/src/components/modals/EditField';import CreateAccount from './modals/CreateAccount';import ManagePayeesWithData from './payees/ManagePayeesWithData';-import ManageRules from './modals/ManageRules';+import ManageRulesModal from './modals/ManageRulesModal';import EditRule from './modals/EditRule';import MergeUnusedPayees from './modals/MergeUnusedPayees';import ConfirmCategoryDelete from './modals/ConfirmCategoryDelete';@@ -167,7 +167,7 @@ function Modals({path="/manage-rules"render={() => {return (- <ManageRules+ <ManageRulesModalhistory={history}modalProps={modalProps}payeeId={options.payeeId}diff --git a/packages/desktop-client/src/components/accounts/Filters.js b/packages/desktop-client/src/components/accounts/Filters.jsindex e39a9cdeb4..3847f75a17 100644--- a/packages/desktop-client/src/components/accounts/Filters.js+++ b/packages/desktop-client/src/components/accounts/Filters.js@@ -32,7 +32,7 @@ import DeleteIcon from 'loot-design/src/svg/Delete';import SettingsSliderAlternate from 'loot-design/src/svg/v2/SettingsSliderAlternate';import { colors } from 'loot-design/src/style';import GenericInput from '../util/GenericInput';-import { Value } from '../modals/ManageRules';+import { Value } from '../ManageRules';let filterFields = ['date',diff --git a/packages/desktop-client/src/components/modals/ManageRulesModal.js b/packages/desktop-client/src/components/modals/ManageRulesModal.jsnew file mode 100644index 0000000000..4b39870a2a--- /dev/null+++ b/packages/desktop-client/src/components/modals/ManageRulesModal.js@@ -0,0 +1,25 @@+import { Modal } from 'loot-design/src/components/common';+import React, { useState } from 'react';+import ManageRules from '../ManageRules';++export default function ManageRulesModal({ modalProps, payeeId }) {+ let [loading, setLoading] = useState(true);+ if (process.env.NODE_ENV === 'development') {+ if (location.pathname !== '/payees') {+ throw new Error(+ `Possibly invalid use of ManageRulesModal, add the current url '${location.pathname}' to the allowlist if you're confident the modal can never appear on top of the '/rules' page.`+ );+ }+ }+ return (+ <Modal+ title="Rules"+ padding={0}+ loading={loading}+ {...modalProps}+ style={[modalProps.style, { flex: 1, maxWidth: '90%' }]}+ >+ {() => <ManageRules payeeId={payeeId} setLoading={setLoading} />}+ </Modal>+ );+}diff --git a/packages/desktop-electron/index.js b/packages/desktop-electron/index.jsindex 91c38fd22d..2b83d70531 100644--- a/packages/desktop-electron/index.js+++ b/packages/desktop-electron/index.js@@ -220,7 +220,6 @@ function updateMenu(isBudgetOpen) {item =>item.label === 'Start Tutorial' ||item.label === 'Manage Payees...' ||- item.label === 'Manage Rules...' ||item.label === 'Load Backup...')diff --git a/packages/desktop-electron/menu.js b/packages/desktop-electron/menu.jsindex f53096de0c..9761b0ec9b 100644--- a/packages/desktop-electron/menu.js+++ b/packages/desktop-electron/menu.js@@ -33,20 +33,6 @@ function getMenu(isDev, createWindow) {}}},- {- label: 'Manage Rules...',- enabled: false,- click(item, focusedWindow) {- if (- focusedWindow &&- focusedWindow.webContents.getTitle() === 'Actual'- ) {- focusedWindow.webContents.executeJavaScript(- '__actionsForMenu.pushModal("manage-rules")'- );- }- }- },{label: 'Load Backup...',enabled: false,diff --git a/packages/loot-design/src/components/sidebar.js b/packages/loot-design/src/components/sidebar.jsindex b0b8c9c304..3015ea5f5f 100644--- a/packages/loot-design/src/components/sidebar.js+++ b/packages/loot-design/src/components/sidebar.js@@ -31,6 +31,7 @@ import { useDraggable, useDroppable, DropHighlight } from './sort.js';import CheveronUp from '../svg/v1/CheveronUp';import CheveronDown from '../svg/v1/CheveronDown';import StoreFrontIcon from '../svg/v1/StoreFront';+import TuningIcon from '../svg/v1/Tuning';import { useLocation } from 'react-router';export const SIDEBAR_WIDTH = 240;@@ -376,9 +377,6 @@ const MenuButton = withRouter(function MenuButton({ history }) {case 'open-payees':dispatch(pushModal('manage-payees'));break;- case 'open-rules':- dispatch(pushModal('manage-rules'));- break;case 'find-schedules':history.push('/schedule/discover', { locationPtr: history.location });break;@@ -397,7 +395,6 @@ const MenuButton = withRouter(function MenuButton({ history }) {let items = [{ name: 'open-payees', text: 'Manage Payees' },- { name: 'open-rules', text: 'Manage Rules' },{ name: 'find-schedules', text: 'Find schedules' },{ name: 'repair-splits', text: 'Repair split transactions' },Menu.line,@@ -440,7 +437,11 @@ function Tools() {let ExpandOrCollapseIcon = isOpen ? CheveronUp : CheveronDown;useEffect(() => {- if (['/schedules'].some(route => location.pathname.startsWith(route))) {+ if (+ ['/schedules', '/rules'].some(route =>+ location.pathname.startsWith(route)+ )+ ) {setOpen(true);}}, [location.pathname]);@@ -487,6 +488,15 @@ function Tools() {}to="/schedules"/>+ <Item+ title="Rules"+ icon={+ <TuningIcon width={15} height={15} style={{ color: 'inherit' }} />+ }+ to="/rules"+ />+ </>+ )}</>);}