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: file size limit for guest pages #359

Merged
merged 1 commit into from
Mar 22, 2024
Merged

Conversation

madassdev
Copy link
Collaborator

@madassdev madassdev commented Mar 22, 2024

Summary by CodeRabbit

  • Bug Fixes
    • Updated file size limit logic in form fields to consider the workspace's maximum file size if available, with a fallback to a default limit.

@madassdev madassdev requested a review from JhumanJ March 22, 2024 10:45
Copy link
Contributor

coderabbitai bot commented Mar 22, 2024

Walkthrough

The recent update enhances the handling of maximum file size limits in form fields within a client application. Specifically, it improves the logic for setting the mbLimit property by considering the maximum file size defined at the workspace level, with a fallback to a default value of 10MB. Additionally, it ensures that a valid limit is always set by checking that the specified maximum file size is greater than 0.

Changes

File Path Change Summary
.../open/forms/OpenFormField.vue Updated mbLimit logic to use workspace's max_file_size if available; added validity check.
.../forms/fields/components/FieldOptions.vue Modified mbLimit calculation based on workspace presence in the form object.

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>.
    • Generate unit-tests 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 tests 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 show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

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 as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • 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/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

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.

Review Status

Actionable comments generated: 1

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between f56cee5 and 729fd7d.
Files selected for processing (2)
  • client/components/open/forms/OpenFormField.vue (1 hunks)
  • client/components/open/forms/fields/components/FieldOptions.vue (1 hunks)
Additional comments: 1
client/components/open/forms/fields/components/FieldOptions.vue (1)
  • 346-346: The update to the mbLimit computed property correctly implements the logic for determining the maximum file size limit based on the presence of a workspace object within the form object. To ensure consistency and maintainability across components, consider aligning this logic with any related changes made in other components, such as OpenFormField.vue. This could involve refactoring or extracting shared logic into a utility function or mixin if the logic becomes more complex or is reused in multiple places.

Comment on lines +275 to +279
let maxFileSize = (this.form?.workspace && this.form?.workspace.max_file_size) ? this.form?.workspace?.max_file_size : 10
if (field?.max_file_size > 0) {
maxFileSize = Math.min(field.max_file_size, maxFileSize)
}
inputProperties.mbLimit = maxFileSize
Copy link
Contributor

Choose a reason for hiding this comment

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

The logic for determining the file upload size limit (mbLimit) is correctly implemented. However, it could be refactored for improved readability and maintainability. Consider extracting this logic into a separate method. This not only makes the code cleaner but also easier to test and maintain.

methods: {
+  calculateMbLimit() {
+    let maxFileSize = 10; // Default value
+    if (this.form?.workspace?.max_file_size) {
+      maxFileSize = this.form.workspace.max_file_size;
+    }
+    if (this.field?.max_file_size > 0) {
+      maxFileSize = Math.min(this.field.max_file_size, maxFileSize);
+    }
+    return maxFileSize;
+  },
  inputProperties(field) {
    const inputProperties = {
      // Existing properties...
    };
    if (field.type === 'files' || (field.type === 'url' && field.file_upload)) {
      inputProperties.multiple = (field.multiple !== undefined && field.multiple);
-     let maxFileSize = (this.form?.workspace && this.form?.workspace.max_file_size) ? this.form?.workspace?.max_file_size : 10;
-     if (field?.max_file_size > 0) {
-       maxFileSize = Math.min(field.max_file_size, maxFileSize);
-     }
+     inputProperties.mbLimit = this.calculateMbLimit();
      inputProperties.accept = (this.form.is_pro && field.allowed_file_types) ? field.allowed_file_types : '';
    }
    // Rest of the method...
  }
}

This refactor introduces a calculateMbLimit method that encapsulates the logic for determining the maximum file size limit, making the inputProperties method cleaner and focusing it more on its primary responsibility.


Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
let maxFileSize = (this.form?.workspace && this.form?.workspace.max_file_size) ? this.form?.workspace?.max_file_size : 10
if (field?.max_file_size > 0) {
maxFileSize = Math.min(field.max_file_size, maxFileSize)
}
inputProperties.mbLimit = maxFileSize
methods: {
calculateMbLimit() {
let maxFileSize = 10; // Default value
if (this.form?.workspace?.max_file_size) {
maxFileSize = this.form.workspace.max_file_size;
}
if (this.field?.max_file_size > 0) {
maxFileSize = Math.min(this.field.max_file_size, maxFileSize);
}
return maxFileSize;
},
inputProperties(field) {
const inputProperties = {
// Existing properties...
};
if (field.type === 'files' || (field.type === 'url' && field.file_upload)) {
inputProperties.multiple = (field.multiple !== undefined && field.multiple);
inputProperties.mbLimit = this.calculateMbLimit();
inputProperties.accept = (this.form.is_pro && field.allowed_file_types) ? field.allowed_file_types : '';
}
// Rest of the method...
}
}

@JhumanJ JhumanJ merged commit b41d6c0 into main Mar 22, 2024
5 checks passed
@JhumanJ JhumanJ deleted the 826fb-file-limit-bug-fix branch March 22, 2024 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants