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

Tags improved #3301

Closed
wants to merge 54 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
6e0d705
proof of concept of wysiwyg for input tags
lelemm Jun 12, 2024
556a7eb
Merge branch 'actualbudget:master' into Tags
lelemm Jun 12, 2024
940f396
Merge branch 'org/master' into Tags
lelemm Aug 13, 2024
158a77f
more features
lelemm Aug 16, 2024
3bac215
new tag filter
lelemm Aug 16, 2024
d552bf9
fixes
lelemm Aug 16, 2024
58f4e60
Filter fix when alternating all <-> any
lelemm Aug 17, 2024
01fc6b5
Merge branch 'master' into filter_fix
lelemm Aug 17, 2024
237ad0a
release notes + linter
lelemm Aug 17, 2024
69db101
Merge branch 'filter_fix' of https://github.com/lelemm/actual into fi…
lelemm Aug 17, 2024
2a5037e
retrigger actions
lelemm Aug 17, 2024
6e882d4
fixed for new rules modal
lelemm Aug 17, 2024
0deced3
fixed for field selection. the same component is used for ops and sel…
lelemm Aug 17, 2024
9ed19d4
linter
lelemm Aug 17, 2024
8fa7fa1
Update packages/desktop-client/src/components/modals/EditRule.jsx
lelemm Aug 19, 2024
05f122e
Merge branch 'master' into filter_fix
lelemm Aug 19, 2024
ee9e1cb
Merge branch 'master' into hastags_rule
lelemm Aug 19, 2024
cd79b65
release notes
lelemm Aug 19, 2024
207b007
fixes for the rules modal
lelemm Aug 19, 2024
64b6777
more fixes
lelemm Aug 19, 2024
e92e237
linter
lelemm Aug 19, 2024
8b26d94
visual regression fixes
lelemm Aug 19, 2024
e2e1b7b
review suggestions
lelemm Aug 19, 2024
ca64f5a
missing this change
lelemm Aug 19, 2024
9de2aef
Merge branch 'master' into hastags_rule
lelemm Aug 19, 2024
78b7a49
arrow selection
lelemm Aug 20, 2024
74aa54c
Merge branch 'Tags' into tags_merged
lelemm Aug 20, 2024
cded206
Merge branch 'hastags_rule' into tags_merged
lelemm Aug 20, 2024
93f0e46
Merge branch 'master' into filter_fix
lelemm Aug 20, 2024
39d1307
linter ajustments
lelemm Aug 20, 2024
d2d5e2e
Merge remote-tracking branch 'upstream/master' into tags_merged
lelemm Aug 20, 2024
a690f36
fixes and changes
lelemm Aug 20, 2024
fa9d4ad
more fix
lelemm Aug 21, 2024
208e82a
Refactory of the tag detection and replacement.
lelemm Aug 21, 2024
2e10f1a
fixes some errors for filter and search bar
lelemm Aug 21, 2024
2939421
fixes
lelemm Aug 21, 2024
45f8b1a
3301.md
lelemm Aug 21, 2024
296ad06
closest for testing in case it doesn't have
lelemm Aug 21, 2024
5fa90ce
typecheck and linter fixes
lelemm Aug 21, 2024
701498d
typechecks
lelemm Aug 21, 2024
c55fd63
removed dependency from 'closest' api from the browser
lelemm Aug 22, 2024
8361a49
typechecks
lelemm Aug 22, 2024
a038ab6
multiple fixes
lelemm Aug 22, 2024
fe4d6fe
Merge branch 'master' into filter_fix
lelemm Aug 22, 2024
054b8b2
retrigger actions
lelemm Aug 22, 2024
f365a0c
Merge branch 'master' into tags_merged
lelemm Aug 22, 2024
3a79ebd
Merge remote-tracking branch 'origin/filter_fix' into tags_merged
lelemm Aug 22, 2024
a9747bb
unrelated fix
lelemm Aug 22, 2024
59f58de
fixes
lelemm Aug 22, 2024
f234783
typecheck fixes
lelemm Aug 22, 2024
9da4d01
hiding the popover when no suggestions are met
lelemm Aug 22, 2024
571c6b2
item selection fix
lelemm Aug 22, 2024
31bd238
more fixes
lelemm Aug 22, 2024
53dc51b
Merge branch 'master' into tags_merged
lelemm Aug 22, 2024
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
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"prepare": "husky"
},
"devDependencies": {
"@types/react-color": "^2",
"@typescript-eslint/eslint-plugin": "^8.1.0",
"@typescript-eslint/parser": "^8.1.0",
"confusing-browser-globals": "^1.0.11",
Expand Down Expand Up @@ -80,5 +81,9 @@
"browserslist": [
"electron 24.0",
"defaults"
]
],
"dependencies": {
"react-color": "^2.19.3",
"react-contenteditable": "^3.3.7"
}
}
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions packages/desktop-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"@types/lodash": "^4",
"@types/promise-retry": "^1.1.6",
"@types/react": "^18.2.0",
"@types/react-color": "^2",
"@types/react-dom": "^18.2.1",
"@types/react-grid-layout": "^1",
"@types/react-modal": "^3.16.0",
Expand Down Expand Up @@ -97,5 +98,8 @@
"test": "vitest",
"e2e": "npx playwright test --browser=chromium",
"vrt": "cross-env VRT=true npx playwright test --browser=chromium"
},
"dependencies": {
"react-color": "^2.19.3"
}
}
4 changes: 2 additions & 2 deletions packages/desktop-client/src/components/accounts/Account.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -1113,10 +1113,10 @@ class AccountInternal extends PureComponent {
);
};

onConditionsOpChange = (value, conditions) => {
onConditionsOpChange = value => {
this.setState({ filterConditionsOp: value });
this.setState({ filterId: { ...this.state.filterId, status: 'changed' } });
this.applyFilters([...conditions]);
this.applyFilters([...this.state.filterConditions]);
if (this.state.search !== '') {
this.onSearch(this.state.search);
}
Expand Down
Loading
Loading