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: import meta of non custom report widgets #3626

Conversation

UnderKoen
Copy link
Member

@UnderKoen UnderKoen commented Oct 10, 2024

When importing the exported file of the report dashboard. Names and timeframe data is lost.

Related feature: #3282

Testing:
The following json should fail on edge to be imported (the metadata of text is required)
dashboard (3).json

The following should be import but without custom names for networth
dashboard (4).json

Hope it is clear!

@actual-github-bot actual-github-bot bot changed the title fix: import meta of non custom report widgets [WIP] fix: import meta of non custom report widgets Oct 10, 2024
Copy link

netlify bot commented Oct 10, 2024

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit cb5f8a0
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/6707fa56080e740008b27421
😎 Deploy Preview https://deploy-preview-3626.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 Oct 10, 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.31 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
static/js/indexeddb-main-thread-worker-e59fee74.js 13.5 kB 0%
static/js/usePreviewTransactions.js 1.64 kB 0%
static/js/BackgroundImage.js 122.29 kB 0%
static/js/AppliedFilters.js 20.96 kB 0%
static/js/resize-observer.js 18.37 kB 0%
static/js/narrow.js 82.55 kB 0%
static/js/wide.js 224.74 kB 0%
static/js/ReportRouter.js 1.51 MB 0%
static/js/index.js 3.33 MB 0%

Copy link
Contributor

github-actions bot commented Oct 10, 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.26 MB → 1.26 MB (+2 B) +0.00%
Changeset
File Δ Size
packages/loot-core/src/server/dashboard/app.ts 📈 +7 B (+0.09%) 7.35 kB → 7.36 kB
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
kcab.worker.js 1.26 MB → 1.26 MB (+2 B) +0.00%

Smaller

No assets were smaller

Unchanged

No assets were unchanged

@UnderKoen UnderKoen changed the title [WIP] fix: import meta of non custom report widgets fix: import meta of non custom report widgets Oct 10, 2024
Copy link
Contributor

coderabbitai bot commented Oct 10, 2024

Walkthrough

The changes in this pull request focus on the importDashboard function located in packages/loot-core/src/server/dashboard/app.ts. The primary modification involves how the meta property is managed when new widgets are inserted into the dashboard. Instead of setting the meta property to null for non-exported custom report widgets, the updated implementation now assigns the meta property directly from the widget, facilitating the inclusion of more detailed metadata. Additionally, the logic for updating existing custom reports has been refined. The previous version did not account for undefined values in the meta property, which could lead to database operation failures. The revised code replaces any undefined values with null, thereby enhancing the robustness of database updates. Overall, these changes improve the functionality of the importDashboard method by ensuring better handling of widget metadata and more reliable database interactions.

Possibly related PRs

Suggested labels

sparkles: Merged

Suggested reviewers

  • MikesGlitch
  • youngcw

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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @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.

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: 1

🧹 Outside diff range and nitpick comments (1)
packages/loot-core/src/server/dashboard/app.ts (1)

Line range hint 14-78: Suggestion: Enhance validation for non-custom report widget meta property

While the change to retain the meta property for non-custom report widgets is good, the exportModel.validate function doesn't explicitly validate this property for non-custom report widgets. To ensure data integrity and prevent potential issues during import, consider adding validation for the meta property of non-custom report widgets.

Here's a suggested modification to the exportModel.validate function:

function isExportedCustomReportWidget(
  widget: ExportImportDashboardWidget,
): widget is ExportImportCustomReportWidget {
  return widget.type === 'custom-report';
}

const exportModel = {
  validate(dashboard: ExportImportDashboard) {
    // ... existing validation ...

    dashboard.widgets.forEach((widget, idx) => {
      // ... existing validation ...

      if (isExportedCustomReportWidget(widget)) {
        reportModel.validate(widget.meta);
      } else if (widget.meta !== undefined) {
        // Add validation for non-custom report widget meta
        if (typeof widget.meta !== 'object' || widget.meta === null) {
          throw new ValidationError(
            `Invalid widget.${idx}.meta: it must be an object for non-custom report widgets.`
          );
        }
        // Add any specific validation for non-custom report widget meta properties here
      }
    });
  },
};

This enhancement will ensure that the meta property is valid for all widget types, improving the robustness of the import process.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 23de23b and cb5f8a0.

⛔ Files ignored due to path filters (1)
  • upcoming-release-notes/3626.md is excluded by !**/*.md
📒 Files selected for processing (1)
  • packages/loot-core/src/server/dashboard/app.ts (1 hunks)
🧰 Additional context used

@@ -194,7 +194,7 @@ async function importDashboard({ filepath }: { filepath: string }) {
y: widget.y,
meta: isExportedCustomReportWidget(widget)
? { id: widget.meta.id }
: null,
: widget.meta,
Copy link
Contributor

Choose a reason for hiding this comment

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

💡 Codebase verification

Issues Found: meta Property Not Defined in Widget Types

The widget.meta property is accessed in multiple parts of the codebase but is not explicitly defined in any widget type or interface definitions. This can lead to type safety issues and potential runtime errors.

Recommendations:

  • Define the meta property in all relevant widget type or interface definitions to ensure consistent and safe usage across the codebase.
  • Add null or undefined checks where widget.meta is accessed to handle cases where meta might not be set.
🔗 Analysis chain

Approve change with verification suggestion

The modification to allow non-custom report widgets to retain their meta property is a good improvement. This change addresses the PR objective of fixing the import of non-custom report widgets.

However, to ensure robustness, we should verify that all non-custom report widget types have a valid meta property. If there's a possibility of undefined meta properties, we might want to add a fallback.

To verify the usage of meta property in non-custom report widgets, run the following script:

This script will help us understand how the meta property is used across different widget types and ensure our change doesn't introduce any unexpected behavior.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check usage of meta property in non-custom report widgets

# Search for widget definitions with meta property
echo "Searching for widget definitions with meta property:"
rg --type typescript 'type.*Widget.*=.*\{.*meta.*:' -g '!**/app.ts'

# Search for places where meta is accessed on widgets
echo "\nSearching for places where meta is accessed on widgets:"
rg --type typescript 'widget\.meta' -g '!**/app.ts'

Length of output: 433


Script:

#!/bin/bash
# Description: Check usage of meta property in non-custom report widgets

# Search for widget definitions with meta property
echo "Searching for widget definitions with meta property:"
rg --type ts 'type.*Widget.*=.*\{.*meta.*:' -g '!**/app.ts'

# Search for places where meta is accessed on widgets
echo "\nSearching for places where meta is accessed on widgets:"
rg --type ts 'widget\.meta' -g '!**/app.ts'

Length of output: 1075


Script:

#!/bin/bash
# Description: Verify that all widget type/interface definitions include a meta property

# Search for type definitions of widgets that include a meta property
echo "Searching for widget type definitions with a meta property:"
rg 'type\s+\w+Widget\s*=\s*\{[^}]*meta\s*:' --type ts

# Search for interface definitions of widgets that include a meta property
echo "\nSearching for widget interface definitions with a meta property:"
rg 'interface\s+\w+Widget\s*{\s*[^}]*meta\s*:' --type ts

# Check for default assignments or fallback mechanisms for widget.meta
echo "\nSearching for default assignments or fallback implementations for widget.meta:"
rg 'widget\.meta\s*\?\?|\|\|' --type ts

Length of output: 85183

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.

This is great; thank you!

@MatissJanis MatissJanis merged commit 3301cfa into actualbudget:master Oct 10, 2024
20 checks passed
@UnderKoen UnderKoen deleted the fix/fix-import-non-custom-report-widgets branch October 24, 2024 06:49
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.

2 participants