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

🐛 (rules) fix filtering in the rules page #2141

Merged
merged 4 commits into from
Jan 5, 2024
Merged

Conversation

MatissJanis
Copy link
Member

@MatissJanis MatissJanis commented Dec 30, 2023

Previously the filtering was applied only to the loaded data. Meaning if there are >1 pages of data - it would initially apply only to the first page. After this fix - the filters are applied to all the pages.

Previously the filtering was applied only to the loaded data. Meaning if there are >1 pages of data - it would initially
apply only to the first page. After this fix - the filters are applied to all the pages.

Closes #1502
Copy link

netlify bot commented Dec 30, 2023

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit 3abef4a
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/6597c5a5b3914800089adb62
😎 Deploy Preview https://deploy-preview-2141.demo.actualbudget.org
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Contributor

github-actions bot commented Dec 30, 2023

Bundle Stats — desktop-client

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
15 3.09 MB → 3.09 MB (-355 B) -0.01%
Changeset
File Δ Size
src/components/ManageRules.tsx 📉 -709 B (-6.12%) 11.32 kB → 10.62 kB
src/components/rules/SimpleTable.tsx 📉 -335 B (-22.24%) 1.47 kB → 1.14 kB
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

No assets were bigger

Smaller

Asset File Size % Changed
static/js/main.js 1.43 MB → 1.43 MB (-355 B) -0.02%

Unchanged

Asset File Size % Changed
static/js/665.chunk.js 824.28 kB 0%
static/media/Inter-italic.var.woff2 239.29 kB 0%
static/media/Inter-roman.var.woff2 221.86 kB 0%
static/js/231.chunk.js 117.38 kB 0%
static/js/wide-components.chunk.js 113.08 kB 0%
static/js/reports.chunk.js 78.28 kB 0%
static/js/narrow-components.chunk.js 45.2 kB 0%
static/js/553.chunk.js 28.56 kB 0%
static/js/473.chunk.js 13 kB 0%
static/js/resize-observer-polyfill.chunk.js 8.88 kB 0%
static/css/main.css 7.41 kB 0%
asset-manifest.json 1.92 kB 0%
index.html 1.66 kB 0%
static/media/browser-server.js 911 B 0%

Copy link
Contributor

github-actions bot commented Dec 30, 2023

Bundle Stats — loot-core

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
2 2.23 MB 0%

Changeset

No files were changed

View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

No assets were bigger

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
kcab.worker.js 1.24 MB 0%
xfo.xfo.kcab.worker.js 1014.46 kB 0%

@MatissJanis MatissJanis added this to the v24.1.0 milestone Dec 30, 2023
@MatissJanis MatissJanis marked this pull request as ready for review December 30, 2023 16:30
@twk3
Copy link
Contributor

twk3 commented Jan 3, 2024

@MatissJanis this looks like a nice cleanup, eliminates a redundant state, and everything seems to be working. But I haven't been able to reproduce the filtering issue in master.

I have however reproduced the other issue referenced in the issue, which remains with this change. Which is that loadMore just isn't firing at all for me in firefox (works fine in my chrome).

@MatissJanis
Copy link
Member Author

But I haven't been able to reproduce the filtering issue in master.

You would need to have multiple pages of rules to reproduce. It won't be possible with the test budget as there' s just not enough rules.

I have however reproduced the other issue referenced in the issue, which remains with this change. Which is that loadMore just isn't firing at all for me in firefox (works fine in my chrome).

Argh.. ok, I'll unlink the bug report. So this change isn't fixing it. Still - it fixes a different issue.

@jasonmichalski
Copy link
Contributor

just submitted PR #2167 to merge into this branch ... should fix the load more rules, but more testers definitely welcome

Copy link
Contributor

@carkom carkom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@twk3 twk3 self-requested a review January 5, 2024 18:46
Copy link
Contributor

@twk3 twk3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MatissJanis you can go ahead a relink this to #1502 because it's now fixing both issues mentioned there.

I reread the issue and finally comprehended what the initial issue was. (I kept thinking it was the loadMore that wasn't being filtered but that was working fine)

This PR looks good.

  • Cleans up multiple redundant state
  • Filter now applies against the full data, so items in future pages now show up right away when the filter includes them and they should be appearing.
  • loadMore is firing properly when scrolling down in firefox (tested on linux popOS)

Thanks @MatissJanis and @jasonmichalski

@MatissJanis MatissJanis linked an issue Jan 5, 2024 that may be closed by this pull request
1 task
@MatissJanis MatissJanis merged commit e0d66d3 into master Jan 5, 2024
18 of 19 checks passed
@MatissJanis MatissJanis deleted the matiss/fix-1502 branch January 5, 2024 19:06
@trafico-bot trafico-bot bot added ✨ Merged Pull Request has been merged successfully and removed ✅ Approved labels Jan 5, 2024
FlorianLang06 pushed a commit to FlorianLang06/actual that referenced this pull request Mar 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
✨ Merged Pull Request has been merged successfully
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Rules only partially loaded
4 participants