-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Fix privacy filter #3472
Fix privacy filter #3472
Conversation
WalkthroughThe pull request introduces several changes across multiple components in the desktop client. Key modifications include the removal of the Changes
Assessment against linked issues
Possibly related PRs
Suggested labels
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
✅ Deploy Preview for actualbudget ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
Bundle Stats — desktop-clientHey 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
Changeset
View detailed bundle breakdownAdded No assets were added Removed No assets were removed Bigger No assets were bigger Smaller
Unchanged
|
Bundle Stats — loot-coreHey 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
Changeset
View detailed bundle breakdownAdded No assets were added Removed No assets were removed Bigger No assets were bigger Smaller
Unchanged No assets were unchanged |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 1
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files ignored due to path filters (1)
upcoming-release-notes/3472.md
is excluded by!**/*.md
Files selected for processing (5)
- packages/desktop-client/src/components/accounts/Balance.jsx (1 hunks)
- packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx (2 hunks)
- packages/desktop-client/src/components/budget/report/ReportComponents.tsx (2 hunks)
- packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx (3 hunks)
- packages/desktop-client/src/components/spreadsheet/CellValue.tsx (2 hunks)
Files skipped from review due to trivial changes (1)
- packages/desktop-client/src/components/accounts/Balance.jsx
Additional comments not posted (9)
packages/desktop-client/src/components/spreadsheet/CellValue.tsx (3)
96-96
: LGTM!The rendering logic within the
PrivacyFilter
component is correct, and the formatting of the cell value remains unchanged.
91-95
: Verify thePrivacyFilter
component's implementation.Ensure that the
PrivacyFilter
component correctly handles theactivationFilters
prop and applies the privacy filtering logic based on the provided conditions.Run the following script to verify the component's implementation:
#!/bin/bash # Description: Verify the `PrivacyFilter` component's implementation. # Test: Check if the `PrivacyFilter` component correctly handles the `activationFilters` prop. Expect: The component to apply filtering based on the provided conditions. ast-grep --lang typescript --pattern $'export function PrivacyFilter({ activationFilters, children }) { $$$ if (activationFilters.some($_)) { $$$ } $$$ }'
6-6
: Verify thePrivacyFilter
component.Ensure that the
PrivacyFilter
component is correctly defined and exported in the../PrivacyFilter
file.Run the following script to verify the component:
Verification successful
PrivacyFilter
component verified successfully.The
PrivacyFilter
component is correctly defined and exported in the../PrivacyFilter.tsx
file. The import statement inCellValue.tsx
is valid and will work as expected.
- The component is defined at
packages/desktop-client/src/components/PrivacyFilter.tsx
- It's exported as a named function:
export function PrivacyFilter({ ... }) { ... }
- The component implementation looks correct, with proper props and logic
Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the `PrivacyFilter` component is correctly defined and exported. # Test: Check if the `PrivacyFilter` component is defined and exported. Expect: A component definition. ast-grep --lang typescript --pattern $'export function PrivacyFilter($_) { $$$ }'Length of output: 167
Script:
#!/bin/bash # Description: Verify the existence and export of the PrivacyFilter component # Test 1: Search for any export of PrivacyFilter echo "Searching for PrivacyFilter export:" ast-grep --lang typescript --pattern 'export $_ PrivacyFilter' # Test 2: Locate the PrivacyFilter file echo -e "\nLocating PrivacyFilter file:" fd PrivacyFilter.tsx # Test 3: If PrivacyFilter file is found, display its contents echo -e "\nContents of PrivacyFilter file (if found):" fd PrivacyFilter.tsx -x cat {}Length of output: 4744
packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx (2)
9-10
: LGTM!The import statement for the
css
function from theglamor
library is valid and follows the correct syntax. Using CSS-in-JS libraries likeglamor
can provide a more modular and maintainable approach to styling React components.
182-193
: Looks good!The transition from inline styles to a CSS-in-JS approach using the
glamor
library for theCellValueText
component is a positive change. It improves the separation of concerns between styling and component logic.The styles are correctly defined using the
css
function and include the necessary properties such asoverflow
,textOverflow
,textAlign
, a conditionalcursor
style based on thedisabled
prop, and a hover effect. The syntax follows the expected format for theglamor
library.packages/desktop-client/src/components/budget/report/ReportComponents.tsx (2)
5-6
: LGTM!Importing the
css
function from theglamor
library is a valid approach for CSS-in-JS styling in React components. This change aligns with the modular and reusable styling practices.
372-380
: Refactoring to CSS-in-JS is a good approach.The change from inline styles to CSS-in-JS using the
glamor
library is a valid refactoring approach. It promotes a more modular and reusable styling pattern while maintaining the same visual behavior.The styles applied using the
css
function, including the pointer cursor, hover underline, and the result ofmakeAmountGrey
, achieve the same styling effects as the original inline styles.This change aligns with best practices for styling React components.
packages/desktop-client/src/components/budget/rollover/RolloverComponents.tsx (2)
364-370
: LGTM!The refactor from inline styles to CSS-in-JS using
glamor
looks good. It improves maintainability and consistency without altering the component's behavior.
479-484
: LGTM!The refactor from inline styles to CSS-in-JS using
glamor
looks good. It improves maintainability and consistency without altering the component's behavior.
packages/desktop-client/src/components/spreadsheet/CellValue.tsx
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can confirm it's fixed. LGTM
0a725ea
to
eb7edc2
Compare
d8267f7
to
c5c8c6f
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 1
Outside diff range and nitpick comments (2)
packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx (2)
364-370
: Approve CSS-in-JS styling change with a minor suggestionThe transition from inline styles to CSS-in-JS using 'glamor' is a good improvement. It enhances code maintainability and allows for more dynamic styling. The incorporation of the
makeAmountGrey
function into the CSS-in-JS styling is done correctly.However, there's a minor optimization that can be made:
The
String()
wrapper around thecss()
call is unnecessary. Thecss()
function already returns a string (the generated class name). You can simplify the code by removingString()
:-className={String( +className={ css({ cursor: 'pointer', ':hover': { textDecoration: 'underline' }, ...makeAmountGrey(props.value), }), -)} +}This change will make the code slightly cleaner without affecting functionality.
479-484
: Approve CSS-in-JS styling change with a minor suggestionThe transition from inline styles to CSS-in-JS using 'glamor' is consistent with the previous change and improves code maintainability.
However, as with the previous instance, there's a minor optimization that can be made:
The
String()
wrapper around thecss()
call is unnecessary. Thecss()
function already returns a string (the generated class name). You can simplify the code by removingString()
:-className={String( +className={ css({ cursor: 'pointer', ':hover': { textDecoration: 'underline' }, }), -)} +}This change will make the code slightly cleaner without affecting functionality.
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files ignored due to path filters (1)
upcoming-release-notes/3472.md
is excluded by!**/*.md
Files selected for processing (5)
- packages/desktop-client/src/components/accounts/Balance.jsx (1 hunks)
- packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx (2 hunks)
- packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx (3 hunks)
- packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx (2 hunks)
- packages/desktop-client/src/components/spreadsheet/CellValue.tsx (3 hunks)
Files skipped from review as they are similar to previous changes (3)
- packages/desktop-client/src/components/accounts/Balance.jsx
- packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx
- packages/desktop-client/src/components/spreadsheet/CellValue.tsx
Additional comments not posted (2)
packages/desktop-client/src/components/budget/envelope/EnvelopeBudgetComponents.tsx (2)
3-4
: LGTM: Import ofcss
from 'glamor'The addition of the
css
import from 'glamor' is appropriate for the styling changes implemented in this file. This import enables the use of CSS-in-JS, which can provide more dynamic and scoped styling capabilities.
Line range hint
1-484
: Summary of changes and their impact on PR objectivesThe changes in this file consistently transition from inline styles to CSS-in-JS using the 'glamor' library. This improves code maintainability and allows for more dynamic styling capabilities. While these changes don't directly address the privacy filter functionality mentioned in the PR objectives, they do improve the overall code structure, which could indirectly contribute to resolving the privacy mode issues.
To fully address the PR objectives:
- Verify that these styling changes don't inadvertently affect the privacy filter functionality.
- Check if there are other files in the PR that more directly address the privacy filter issues mentioned in the linked issue [Bug]: privacy mode is broken #3470.
Run the following script to search for files that might be more directly related to the privacy filter functionality:
This will help ensure that the PR fully addresses the stated objectives of fixing the privacy filter issues.
packages/desktop-client/src/components/budget/tracking/TrackingBudgetComponents.tsx
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Has a change in this PR altered the default theme from light
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think so. There's no theme changes in this PR. This could be what's causing the flakiness in the VRT.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed the screenshot, re-ran the VRT and it failed. I re-run the VRT again, and it now succeeds.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, definitely some odd flakes flying about. If we could get to the bottom of the fatal error on the rules page it would be a good start. I'll see if I can add some debugging and rerun locally until it fails.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
* Fix privacy filter * Release notes * Coderabbit suggestion * VRT * VRT * Revert VRT * VRT * VRT * VRT * VRT * Delete VRT * VRT * Revert VRT
* marked files for translation * added release note * fixed linting warnings * 🐛 fix account filters being overridden (#3441) * Reduce package size (#3443) * reduce package size of all packages * release notes * Update beforePackHook.ts * [Maintenance] Cleanup react aria packages and dedupe (#3450) * Cleanup react aria packages and dedupe * Release notes * ♻️ (synced-prefs) moving the prefs from metadata.json to the db (#3423) * Restart server silently when adding self signed cert and add some logs (#3431) * restart server silently on add self signed cert and add some logging * release notes * fix name * updating names to be more specific * removing setloading * feedback * ♻️ (synced-prefs) move budget type to synced prefs (#3427) * update synced account balance in db if available (#3452) * 🐛 (synced-prefs) fix bulk-reading not working in import modal (#3460) * fix: csv import deduplication (#3456) * ✨ release simplefin as a first-party feature (#3459) Closes #2272 * Do not allow renaming to an empty category or group name (#3463) * Do not allow renaming to an emoty category or group name * Release notes * [Mobile] Fix #3214 - Pull down to refresh triggering clicks on budget cells (#3374) * Fix #3214 * Fix rollover indicator * VRT * Fix typecheck error * VRT * Release notes * VRT * Update style * Fix budgeted * VRT * VRT * Revert VRT * VRT * Fix style * Revert usePreviewTransactions * Fix error * Fix reports form submit handlers (#3462) * Fix form submit handlers * Release notes * Remove some old updater code (#3468) * remove some old updater code * remove old updater logic * CSV import e2e tests (#3467) * Fix React Aria Button hover styles (#3453) * Fiox hover styles and use className instead of inline to prepare for future css migration * Release notes * Cleanup * Update edit rule hover style * Undoable auto transfer notes + auto notes for cover (#3411) * Undo auto transfer notes + auto notes for cover * Release notes * Fix notes * Fix notes undo * Do not show clicked category on transfer or cover menus * Fix typecheck error * typecheck * Fix removeCategoriesFromGroups * 🐛 (reports) deleting custom report should remove it from the dashboard (#3469) * Revert "CSV import e2e tests (#3467)" (#3474) This reverts commit 5e12d40. * ♻️ (synced-prefs) separate metadata and local prefs out (#3458) * Replace deprecated file protocol registration (#3475) * replace deprecated file handler in electron * release notes * types eh * types * update sql regexp to default to empty string when field is null (#3480) * ♻️ rename report/rollover budget to tracking/envelope (#3483) * 🐛 (import) fix csv import checkboxes not working (#3478) * Update tooltip and themes with better visibility (#3298) * Update tooltip and themes with better visibility * Rename merge request # into release notes * rename release note * update VRT * tweak light theme * dont put border on autocomplete menus * update VRT * tweak popover style * simplify * update VRT * update VRT --------- Co-authored-by: Dustin Conlon <[email protected]> Co-authored-by: Dustin Conlon <[email protected]> Co-authored-by: youngcw <[email protected]> * fix modals on mobile BudgetTable (#3487) * Fix privacy filter (#3472) * Fix privacy filter * Release notes * Coderabbit suggestion * VRT * VRT * Revert VRT * VRT * VRT * VRT * VRT * Delete VRT * VRT * Revert VRT * 🐛 fix custom reports crashing when opening table (#3484) * 🧪 (tests) adding custom report e2e tests (#3493) * ✨ (dashboards) ability to save filters & timeframes on spending widgets (#3432) * marked files for translation * Revert ":bug: fix account filters being overridden (#3441)" This reverts commit 7336bad. * Revert "Revert ":bug: fix account filters being overridden (#3441)"" This reverts commit 5cbadc4. * Revert changes due to failed rebase * removed import of t * fixed lint warning * added PayeeTableRow.tsx * needed changes * bugfix: pluralization * variables adjustments * removed doubled trans --------- Co-authored-by: Matiss Janis Aboltins <[email protected]> Co-authored-by: Michael Clark <[email protected]> Co-authored-by: Joel Jeremy Marquez <[email protected]> Co-authored-by: Matt Fiddaman <[email protected]> Co-authored-by: Koen van Staveren <[email protected]> Co-authored-by: Ryan Bianchi <[email protected]> Co-authored-by: Robert Dyer <[email protected]> Co-authored-by: Dustin Conlon <[email protected]> Co-authored-by: Dustin Conlon <[email protected]> Co-authored-by: youngcw <[email protected]> Co-authored-by: Tim <[email protected]>
Resolves #3470