Skip to content

Support fields validation with captcha#1961

Merged
Crabcyborg merged 2 commits into
masterfrom
issue-5304-support_fields_validation_with_captcha
Sep 9, 2024
Merged

Support fields validation with captcha#1961
Crabcyborg merged 2 commits into
masterfrom
issue-5304-support_fields_validation_with_captcha

Conversation

@AbdiTolesa
Copy link
Copy Markdown
Contributor

@AbdiTolesa AbdiTolesa commented Sep 3, 2024

Fix https://github.com/Strategy11/formidable-pro/issues/5304

Test Procedure

  1. Create a form and add a phone field to it, set the Format to 'International'.
  2. Turn on 'Validate this form with javascript' in the form setting.
  3. Add a Captcha field, in your global Captcha setting, your set set it to V3 / Invisible captcha.
  4. Preview the form.
  5. Try submitting a non international phone number like just '1234'.
  6. Confirm that the validation fails and the form would not submit.

@AbdiTolesa AbdiTolesa marked this pull request as ready for review September 4, 2024 07:03
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Sep 4, 2024

Walkthrough

The changes made to the frmFrontFormJS function involve restructuring the validation logic to improve control flow. The validation process is now initiated at the beginning of the function, ensuring that any errors are identified before proceeding with the loading indicator and the execution of the invisible reCAPTCHA. This adjustment streamlines the process by preventing unnecessary loading states when validation errors are present.

Changes

File Change Summary
js/formidable.js Consolidated validation logic in frmFrontFormJS function by moving validateFormSubmit to the start, ensuring errors are checked before showing the loading indicator and executing reCAPTCHA.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant Form
    participant Validator
    participant reCAPTCHA

    User->>Form: Submit Form
    Form->>Validator: Validate Form
    alt No Errors
        Form->>Form: Show Loading Indicator
        Form->>reCAPTCHA: Execute reCAPTCHA
    else Errors
        Form->>Form: Show Validation Errors
    end
Loading

Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between ec473b0 and 6be11f4.

Files selected for processing (1)
  • js/formidable.js (1 hunks)
Files skipped from review as they are similar to previous changes (1)
  • js/formidable.js

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 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 show all the console.log statements in this repository.
    • @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
Copy Markdown

@garretlaxton garretlaxton left a comment

Choose a reason for hiding this comment

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

This works great!

@Crabcyborg Crabcyborg requested a review from truongwp September 8, 2024 00:44
@Crabcyborg Crabcyborg added this to the 6.13.1 milestone Sep 9, 2024
Copy link
Copy Markdown
Contributor

@truongwp truongwp left a comment

Choose a reason for hiding this comment

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

This looks good. Thanks @AbdiTolesa!

@truongwp truongwp requested a review from Crabcyborg September 9, 2024 15:53
Copy link
Copy Markdown
Contributor

@Crabcyborg Crabcyborg left a comment

Choose a reason for hiding this comment

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

Thank you @AbdiTolesa @truongwp and @garretlaxton for working on this!

I think this looks good to merge.

🚀

@Crabcyborg Crabcyborg merged commit 89ddae2 into master Sep 9, 2024
@Crabcyborg Crabcyborg deleted the issue-5304-support_fields_validation_with_captcha branch September 9, 2024 16:08
@Crabcyborg Crabcyborg removed this from the 6.13.1 milestone Sep 9, 2024
@Crabcyborg
Copy link
Copy Markdown
Contributor

Nevermind!

I spoke too soon.

I'm reverting this #1973

There's a reason why it processes the captcha before it does the JS validation.

After the JS validation happens, the captcha goes red and I can't submit my form.

Screen.Recording.2024-09-09.at.1.19.17.PM.mov

@AbdiTolesa
Copy link
Copy Markdown
Contributor Author

AbdiTolesa commented Sep 19, 2024

@Crabcyborg I tested this again following your steps but I can't trigger the captcha error, here is my screen record:
CleanShot 2024-09-19 at 05 13 36

@Crabcyborg
Copy link
Copy Markdown
Contributor

@AbdiTolesa I'm not sure why it isn't failing for you. It should be failing when validateRecaptcha is called unless your CAPTCHA has already validated for some reason.

Since validateRecaptcha is called before an invisible reCAPTCHA has had the chance to run, the function will return an error.

I was able to fix my issue by avoiding the call to validateRecaptcha when the captcha is invisible.

I have a new PR here #2003

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.

4 participants