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

fix: csv import deduplication #3456

Merged
merged 5 commits into from
Sep 18, 2024

Conversation

UnderKoen
Copy link
Member

fixes #3416

@actual-github-bot actual-github-bot bot changed the title fix: csv import deduplication [WIP] fix: csv import deduplication Sep 17, 2024
Copy link

netlify bot commented Sep 17, 2024

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit 883598c
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/66ea7bb68ab7c90008acd25d
😎 Deploy Preview https://deploy-preview-3456.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.

@UnderKoen UnderKoen changed the title [WIP] fix: csv import deduplication fix: csv import deduplication Sep 17, 2024
Copy link
Contributor

github-actions bot commented Sep 17, 2024

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
9 5.18 MB → 5.28 MB (+105.56 kB) +1.99%
Changeset (largest 100 files by percent change)
File Δ Size
node_modules/object-inspect/index.js 🆕 +18.67 kB 0 B → 18.67 kB
node_modules/get-intrinsic/index.js 🆕 +13.3 kB 0 B → 13.3 kB
node_modules/deep-equal/index.js 🆕 +12.87 kB 0 B → 12.87 kB
node_modules/es-get-iterator/index.js 🆕 +5.66 kB 0 B → 5.66 kB
node_modules/side-channel/index.js 🆕 +3.83 kB 0 B → 3.83 kB
node_modules/which-typed-array/index.js 🆕 +3.58 kB 0 B → 3.58 kB
node_modules/object-keys/implementation.js 🆕 +3.43 kB 0 B → 3.43 kB
node_modules/is-callable/index.js 🆕 +3.15 kB 0 B → 3.15 kB
node_modules/define-data-property/index.js 🆕 +2.24 kB 0 B → 2.24 kB
node_modules/function-bind/implementation.js 🆕 +1.99 kB 0 B → 1.99 kB
node_modules/has-symbols/shams.js 🆕 +1.7 kB 0 B → 1.7 kB
node_modules/for-each/index.js 🆕 +1.7 kB 0 B → 1.7 kB
node_modules/internal-slot/index.js 🆕 +1.48 kB 0 B → 1.48 kB
node_modules/is-array-buffer/index.js 🆕 +1.34 kB 0 B → 1.34 kB
node_modules/object.assign/implementation.js 🆕 +1.34 kB 0 B → 1.34 kB
node_modules/is-regex/index.js 🆕 +1.33 kB 0 B → 1.33 kB
node_modules/object.assign/polyfill.js 🆕 +1.25 kB 0 B → 1.25 kB
node_modules/define-properties/index.js 🆕 +1.22 kB 0 B → 1.22 kB
node_modules/set-function-length/index.js 🆕 +1.2 kB 0 B → 1.2 kB
node_modules/is-weakmap/index.js 🆕 +1.13 kB 0 B → 1.13 kB
node_modules/is-map/index.js 🆕 +1.06 kB 0 B → 1.06 kB
node_modules/is-set/index.js 🆕 +1.05 kB 0 B → 1.05 kB
node_modules/call-bind/index.js 🆕 +1.04 kB 0 B → 1.04 kB
node_modules/is-weakset/index.js 🆕 +964 B 0 B → 964 B
node_modules/is-arguments/index.js 🆕 +933 B 0 B → 933 B
node_modules/stop-iteration-iterator/index.js 🆕 +860 B 0 B → 860 B
node_modules/regexp.prototype.flags/polyfill.js 🆕 +838 B 0 B → 838 B
node_modules/object-keys/index.js 🆕 +794 B 0 B → 794 B
node_modules/is-symbol/index.js 🆕 +788 B 0 B → 788 B
node_modules/functions-have-names/index.js 🆕 +780 B 0 B → 780 B
node_modules/regexp.prototype.flags/shim.js 🆕 +746 B 0 B → 746 B
node_modules/is-bigint/index.js 🆕 +746 B 0 B → 746 B
node_modules/set-function-name/index.js 🆕 +691 B 0 B → 691 B
node_modules/regexp.prototype.flags/implementation.js 🆕 +671 B 0 B → 671 B
node_modules/is-boolean-object/index.js 🆕 +654 B 0 B → 654 B
node_modules/which-boxed-primitive/index.js 🆕 +640 B 0 B → 640 B
node_modules/has-property-descriptors/index.js 🆕 +573 B 0 B → 573 B
node_modules/is-number-object/index.js 🆕 +536 B 0 B → 536 B
node_modules/is-string/index.js 🆕 +525 B 0 B → 525 B
node_modules/object.assign/index.js 🆕 +493 B 0 B → 493 B
node_modules/is-date-object/index.js 🆕 +489 B 0 B → 489 B
node_modules/available-typed-arrays/index.js 🆕 +469 B 0 B → 469 B
node_modules/is-shared-array-buffer/index.js 🆕 +467 B 0 B → 467 B
node_modules/which-collection/index.js 🆕 +463 B 0 B → 463 B
node_modules/object-keys/isArguments.js 🆕 +415 B 0 B → 415 B
node_modules/call-bind/callBound.js 🆕 +404 B 0 B → 404 B
node_modules/has-symbols/index.js 🆕 +395 B 0 B → 395 B
node_modules/array-buffer-byte-length/index.js 🆕 +394 B 0 B → 394 B
node_modules/regexp.prototype.flags/index.js 🆕 +358 B 0 B → 358 B
node_modules/es-define-property/index.js 🆕 +350 B 0 B → 350 B
node_modules/has-bigints/index.js 🆕 +331 B 0 B → 331 B
node_modules/object-is/index.js 🆕 +328 B 0 B → 328 B
node_modules/has-proto/index.js 🆕 +290 B 0 B → 290 B
node_modules/object-is/implementation.js 🆕 +275 B 0 B → 275 B
node_modules/object-is/shim.js 🆕 +273 B 0 B → 273 B
node_modules/object.assign/shim.js 🆕 +272 B 0 B → 272 B
node_modules/gopd/index.js 🆕 +245 B 0 B → 245 B
node_modules/possible-typed-array-names/index.js 🆕 +244 B 0 B → 244 B
node_modules/hasown/index.js 🆕 +178 B 0 B → 178 B
node_modules/object-is/polyfill.js 🆕 +158 B 0 B → 158 B
node_modules/has-tostringtag/shams.js 🆕 +151 B 0 B → 151 B
node_modules/isarray/index.js 🆕 +128 B 0 B → 128 B
node_modules/function-bind/index.js 🆕 +105 B 0 B → 105 B
�__vite-browser-external?commonjs-proxy 🆕 +79 B 0 B → 79 B
node_modules/es-errors/syntax.js 🆕 +59 B 0 B → 59 B
node_modules/es-errors/range.js 🆕 +56 B 0 B → 56 B
node_modules/es-errors/ref.js 🆕 +56 B 0 B → 56 B
node_modules/es-errors/eval.js 🆕 +54 B 0 B → 54 B
node_modules/es-errors/type.js 🆕 +53 B 0 B → 53 B
node_modules/es-errors/uri.js 🆕 +50 B 0 B → 50 B
node_modules/es-errors/index.js 🆕 +48 B 0 B → 48 B
node_modules/es-get-iterator/index.js?commonjs-module 🆕 +34 B 0 B → 34 B
__vite-browser-external 🆕 +33 B 0 B → 33 B
node_modules/call-bind/index.js?commonjs-module 🆕 +31 B 0 B → 31 B
node_modules/is-symbol/index.js?commonjs-module 🆕 +31 B 0 B → 31 B
node_modules/is-weakset/index.js?commonjs-module 🆕 +30 B 0 B → 30 B
node_modules/is-bigint/index.js?commonjs-module 🆕 +29 B 0 B → 29 B
node_modules/hyphenate-style-name/index.js?commonjs-proxy 📈 +2 B (+2.63%) 76 B → 78 B
node_modules/hyphenate-style-name/index.js 📈 +8 B (+1.90%) 420 B → 428 B
node_modules/is-buffer/index.js 📈 +4 B (+1.09%) 367 B → 371 B
node_modules/extend/index.js 📈 +34 B (+1.01%) 3.29 kB → 3.33 kB
node_modules/date-fns/esm/_lib/assign/index.js 📈 +2 B (+0.62%) 322 B → 324 B
node_modules/react-is/cjs/react-is.production.min.js 📈 +12 B (+0.43%) 2.7 kB → 2.71 kB
node_modules/css-in-js-utils/lib/hyphenateProperty.js 📈 +2 B (+0.34%) 596 B → 598 B
node_modules/react-i18next/dist/es/utils.js 📈 +10 B (+0.32%) 3.09 kB → 3.1 kB
node_modules/@react-spring/animated/dist/react-spring_animated.modern.mjs 📈 +24 B (+0.29%) 8.14 kB → 8.17 kB
node_modules/micromark-util-combine-extensions/index.js 📈 +6 B (+0.28%) 2.06 kB → 2.07 kB
node_modules/@react-spring/core/dist/react-spring_core.modern.mjs 📈 +138 B (+0.23%) 58.12 kB → 58.25 kB
node_modules/date-fns/esm/isDate/index.js 📈 +2 B (+0.22%) 905 B → 907 B
node_modules/date-fns/esm/isValid/index.js 📈 +2 B (+0.19%) 1.01 kB → 1.01 kB
node_modules/object-assign/index.js 📈 +4 B (+0.19%) 2.05 kB → 2.05 kB
src/components/modals/ImportTransactionsModal.jsx 📈 +80 B (+0.15%) 52.18 kB → 52.26 kB
node_modules/react-i18next/dist/es/useTranslation.js 📈 +6 B (+0.14%) 4.22 kB → 4.23 kB
node_modules/@react-spring/web/dist/react-spring_web.modern.mjs 📈 +10 B (+0.13%) 7.71 kB → 7.72 kB
node_modules/react-i18next/dist/es/TransWithoutContext.js 📈 +10 B (+0.09%) 10.6 kB → 10.61 kB
node_modules/mdast-util-to-string/lib/index.js 📈 +2 B (+0.08%) 2.56 kB → 2.56 kB
node_modules/lodash.debounce/index.js 📈 +8 B (+0.07%) 10.65 kB → 10.66 kB
node_modules/@react-spring/shared/dist/react-spring_shared.modern.mjs 📈 +20 B (+0.07%) 27.69 kB → 27.71 kB
node_modules/mdast-util-to-hast/lib/state.js 📈 +8 B (+0.07%) 11.6 kB → 11.6 kB
home/runner/work/actual/actual/packages/loot-core/src/shared/months.ts 📈 +4 B (+0.05%) 7.85 kB → 7.85 kB
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
static/js/index.js 3.21 MB → 3.31 MB (+105.56 kB) +3.22%

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
static/js/indexeddb-main-thread-worker-e59fee74.js 13.5 kB 0%
static/js/BackgroundImage.js 122.29 kB 0%
static/js/resize-observer.js 18.37 kB 0%
static/js/usePreviewTransactions.js 1.59 kB 0%
static/js/AppliedFilters.js 20.97 kB 0%
static/js/narrow.js 80.62 kB 0%
static/js/wide.js 225.21 kB 0%
static/js/ReportRouter.js 1.5 MB 0%

Copy link
Contributor

github-actions bot commented Sep 17, 2024

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
1 1.19 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.19 MB 0%

Copy link
Contributor

coderabbitai bot commented Sep 17, 2024

Walkthrough

The changes introduced in this pull request focus on improving the handling of transaction data in the ImportTransactionsModal.jsx file and fixing a bug related to CSV import deduplication. The validation of the payee field has been refined, and a deep equality check for state updates has been implemented. Additionally, a bug fix enhances the CSV import functionality by ensuring that duplicate entries are correctly identified, thus improving data integrity.

Changes

File Path Change Summary
packages/desktop-client/src/components/modals/... Updated validation for payee field and implemented deep equality check for transactions state.
upcoming-release-notes/3456.md Added bug fix for CSV import deduplication to ensure duplicate entries are handled correctly.

Assessment against linked issues

Objective Addressed Explanation
Ensure duplicate entries are correctly identified during CSV import (Issue #3416)
Show matching transactions in the import window (Issue #3416) The change does not explicitly address the UI aspect of showing matches.

Poem

🐰 In fields of data, I hop with glee,
Fixing bugs and making things free!
With payees checked and duplicates gone,
Our imports now shine like the dawn!
So let’s celebrate, with a joyful cheer,
For cleaner transactions, let’s all draw near! 🌼


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?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    -- I pushed a fix in commit <commit_id>, please review it.
    -- Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    -- @coderabbitai generate unit testing code for this file.
    -- @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    -- @coderabbitai generate interesting stats about this repository and render them as a table.
    -- @coderabbitai read src/utils.ts and generate unit testing code.
    -- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    -- @coderabbitai help me debug CodeRabbit configuration file.

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)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@MatissJanis
Copy link
Member

👋 Thanks for working on this! Would you have an example CSV file I could use for testing the patch? That would help me greatly 🙏

@UnderKoen
Copy link
Member Author

UnderKoen commented Sep 17, 2024

Vanguard-401k.csv
This is just an export of one of the accounts in the demo file
@MatissJanis

@MatissJanis
Copy link
Member

@coderabbitai review

Copy link
Contributor

coderabbitai bot commented Sep 17, 2024

Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Outside diff range and nitpick comments (1)
packages/desktop-client/src/components/modals/ImportTransactionsModal.jsx (1)

926-927: Validation looks good, but consider enhancing the error message.

The null and type check for trans.payee_name is a good defensive programming practice. However, consider including additional context in the error message, such as the transaction date or amount, to make debugging easier.

For example:

-console.log(`Unable·to·parse·payee·${trans.payee_name || '(empty)'}`);
+console.log(`Unable to parse payee "${trans.payee_name || '(empty)'}" for transaction on ${trans.date} with amount ${trans.amount}`);
Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 17fd068 and 8a343d8.

Files selected for processing (2)
  • packages/desktop-client/src/components/modals/ImportTransactionsModal.jsx (3 hunks)
  • upcoming-release-notes/3456.md (1 hunks)
Additional comments not posted (3)
upcoming-release-notes/3456.md (1)

1-6: Release note looks good!

The release note follows the correct structure and provides a clear and concise description of the bug fix. The metadata in the YAML front matter is accurate, and the issue number is correctly referenced.

Great job on documenting this fix!

packages/desktop-client/src/components/modals/ImportTransactionsModal.jsx (2)

4-4: LGTM!

Importing the deepEqual function from the deep-equal package is a good practice for performing deep equality comparisons.


1383-1386: Looks good to me!

Using deepEqual for comparing the current and new transactions state is the right approach. Updating the state only when there's an actual change avoids unnecessary re-renders and improves performance. The useCallback dependencies also look correct.

@MatissJanis
Copy link
Member

Thanks! I noticed another bug here (introduced by me). We'll need to merge this PR first and then I'll return back to your PR. Apologies about the delay.

Copy link
Member

@MatissJanis MatissJanis left a comment

Choose a reason for hiding this comment

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

Thanks! Now we just need to patch the checkboxes in the CSV import modal not working as expected. But that's a separate issue I believe.

a-gradina pushed a commit to a-gradina/actual that referenced this pull request Sep 24, 2024
matt-fidd added a commit that referenced this pull request Oct 3, 2024
* marked files for translation

* added release note

* fixed linting warnings

* 🐛 fix account filters being overridden (#3441)

* :electron: 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)

* :electron: 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

* :electron: 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)

* :electron: 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 <dustin@dustinconlon.com>
Co-authored-by: Dustin Conlon <58367364+VoltaicGRiD@users.noreply.github.com>
Co-authored-by: youngcw <calebyoung94@gmail.com>

* 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 <matiss@mja.lv>
Co-authored-by: Michael Clark <5285928+MikesGlitch@users.noreply.github.com>
Co-authored-by: Joel Jeremy Marquez <joeljeremy.marquez@gmail.com>
Co-authored-by: Matt Fiddaman <github@m.fiddaman.uk>
Co-authored-by: Koen van Staveren <koenvanstaveren@hotmail.com>
Co-authored-by: Ryan Bianchi <1435081+qedi-r@users.noreply.github.com>
Co-authored-by: Robert Dyer <rdyer@unl.edu>
Co-authored-by: Dustin Conlon <dustin@dustinconlon.com>
Co-authored-by: Dustin Conlon <58367364+VoltaicGRiD@users.noreply.github.com>
Co-authored-by: youngcw <calebyoung94@gmail.com>
Co-authored-by: Tim <hello@timsmart.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: CSV duplicate matching no longer showing in the import window.
2 participants