Validate JavaScript condition in Layer Rule on save (#12901) #12968

sobotama · 2022-12-21T14:08:14Z

ns8482e · 2022-12-22T14:22:19Z

src/OrchardCore.Modules/OrchardCore.Rules/Drivers/JavascriptConditionDisplayDriver.cs

+
+                try
+                {
+                    _ = await _evaluator.EvaluateAsync(new()


use ParseScript instead of evaluate

Should I parse it first and then evaluate? Sébastien Roses second point in the issue is "ensure that evaluating the script is not breaking the full page..." so I have to evaluate and I thought that since EvaluateAsync parses it with ParseScript before evaluation then I only need to catch the exception, otherwise I would be parsing it twice.

github-actions · 2024-01-29T13:28:11Z

This pull request has merge conflicts. Please resolve those before requesting a review.

Piedone · 2024-03-19T22:49:58Z

I sincerely apologize for us taking so much time here. I checked out the PR, going over old ones, and this would be quite useful. It needs some tweaks, and the merge conflict resolved though. And foremost, so we can do anything with the code, you'd need to accept the CLA (unfortunately, the CLA bot was broken for a while).

Is this something you'd like to revisit any time soon @sobotama or should we close?

…with a space

sobotama · 2024-04-02T10:03:31Z

Hello,

thanks for responding, I completely forgot that this was still unresovled.

I took care of the merge conflict, I'm currently figuring out the CLA with the company I work at and in the meantime, is there something else I should do @Piedone?

sobotama · 2024-04-02T11:57:20Z

@dotnet-policy-service agree

Piedone · 2024-04-02T15:43:49Z

Great, thank you! @ns8482e would you like to get back to the review, or should I take over?

github-actions · 2024-04-18T19:48:04Z

This pull request has merge conflicts. Please resolve those before requesting a review.

Piedone · 2024-04-19T00:44:02Z

@ns8482e could you reply here, please?

…-condition-validation # Conflicts: # src/OrchardCore.Modules/OrchardCore.Rules/Drivers/JavascriptConditionDisplayDriver.cs

Piedone

Let me take over the review here, and thank you for your patience! I have some small remarks; once you address those, I'll merge ASAP.

When addressing review feedback, please adhere to the following:

Please update your pull request according to feedback until it is approved by one of the core team members.
Apply suggested changes directly so the reviewer doesn't have to eyeball the changes. These resolve themselves after applying them, and that's fine.
Don't resolve other conversations so it's easier to track for the reviewer. Then, the reviewer will resolve them.
Feel free to mark conversations that you addressed to keep track of them with an emoji or otherwise, just don't resolve them.
Please keep conversations happening in line comments in those convos, otherwise, communication will be a mess. If you have trouble finding them, see this video.
When you're done addressing all feedback of a review, click "Re-request review" in the top-right corner for each reviewer when you're ready for another round of review, so they know that you're done.

src/OrchardCore.Modules/OrchardCore.Rules/Drivers/JavascriptConditionDisplayDriver.cs

Changed error messages, comment moved to more meaningfull place Co-authored-by: Zoltán Lehóczky <[email protected]>

coderabbitai · 2024-04-24T08:32:56Z

Walkthrough

The update primarily enhances the JavascriptConditionDisplayDriver in the OrchardCore.Rules module by integrating additional dependencies and improving script validation. It incorporates new using directives and dependencies like Jint for JavaScript parsing and execution, and localizer interfaces for better message handling. The UpdateAsync method now robustly manages script errors, ensuring user feedback through notifications.

Changes

File Path	Change Summary
`.../JavascriptConditionDisplayDriver.cs`	Added new using directives, private fields for localizers and notifier, constructor updates, and enhanced script validation in `UpdateAsync`.
`.../OrchardCore.Rules/OrchardCore.Rules.csproj`	Added `PackageReference` for `Jint`.

Recent Review Details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 57bf155 and 9e249c2.

Files selected for processing (2)

src/OrchardCore.Modules/OrchardCore.Rules/Drivers/JavascriptConditionDisplayDriver.cs (2 hunks)
src/OrchardCore.Modules/OrchardCore.Rules/OrchardCore.Rules.csproj (1 hunks)

Additional comments not posted (4)

src/OrchardCore.Modules/OrchardCore.Rules/OrchardCore.Rules.csproj (1)

18-18: The addition of the Jint package reference is appropriate for the JavaScript validation functionality.

src/OrchardCore.Modules/OrchardCore.Rules/Drivers/JavascriptConditionDisplayDriver.cs (3)

1-13: The addition of new using directives supports the new functionalities introduced, such as localization, notifications, and JavaScript condition evaluation.

25-35: The constructor is well-implemented, correctly initializing all necessary services for the driver's functionality.

60-93: The updates to the UpdateAsync method correctly implement the script validation logic. However, consider moving the general comment about CodeMirror to a more appropriate place above the whole code block, as previously suggested.

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.

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.
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.

Piedone · 2024-04-24T20:37:05Z

@allcontributors please add @sobotama for code

allcontributors · 2024-04-24T20:37:15Z

@Piedone

I've put up a pull request to add @sobotama! 🎉

Piedone · 2024-04-24T20:47:03Z

Thank you, and congrats on your first contribution to Orchard Core! I promise the next one won't take us two years to accept :). We implemented a lot of improvements in managing PRs since then: #15029.

Once the docs page build finishes, you'll also show up in the hall of fame here: https://docs.orchardcore.net/en/latest/docs/community/contributors/.

github-actions · 2024-04-24T20:48:49Z

Congratulations on your first PR merge! 🎉 Thank you for your contribution! We're looking forward to welcome other contributions of yours in the future. @all-contributors please add @sobotama for code.

If you like Orchard Core, please star our repo and join our community channels

allcontributors · 2024-04-24T20:48:51Z

@github-actions[bot]

I couldn't determine any contributions to add, did you specify any contributions?
Please make sure to use valid contribution names.

@sobotama already contributed before to code

Piedone · 2024-04-24T20:52:43Z

Ah, I forgot that adding contributors is now automated :).

Validate JavaScript condition while saving (#12901)

2448eab

ns8482e reviewed Dec 22, 2022

View reviewed changes

github-actions bot added the merge conflict label Jan 29, 2024

Update to main

b5ddf55

github-actions bot removed the merge conflict label Apr 2, 2024

Remove unused options, fix SA1005 - Single line comment should begin …

9a3c08f

…with a space

github-actions bot added the merge conflict label Apr 18, 2024

Merge remote-tracking branch 'official/main' into sobotama/javascript…

ac4cc50

…-condition-validation # Conflicts: # src/OrchardCore.Modules/OrchardCore.Rules/Drivers/JavascriptConditionDisplayDriver.cs

github-actions bot removed the merge conflict label Apr 21, 2024

Piedone requested changes Apr 21, 2024

View reviewed changes

Apply suggestions from code review

9e249c2

Changed error messages, comment moved to more meaningfull place Co-authored-by: Zoltán Lehóczky <[email protected]>

sobotama requested a review from Piedone April 24, 2024 08:35

Piedone mentioned this pull request Apr 24, 2024

Set up CodeRabbit for AI code reviews (Lombiq Technologies: OCORE-159) #15813

Merged

Piedone approved these changes Apr 24, 2024

View reviewed changes

allcontributors bot mentioned this pull request Apr 24, 2024

add sobotama as a contributor for code #15819

Merged

Piedone merged commit 9a39f30 into OrchardCMS:main Apr 24, 2024
5 checks passed

Piedone changed the title ~~Validate JavaScript condition while saving (#12901)~~ Validate JavaScript condition in Layer Rule on save (#12901) Apr 24, 2024

sobotama deleted the sobotama/javascript-condition-validation branch April 25, 2024 13:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Validate JavaScript condition in Layer Rule on save (#12901) #12968

Validate JavaScript condition in Layer Rule on save (#12901) #12968

sobotama commented Dec 21, 2022

ns8482e Dec 22, 2022

sobotama Jan 5, 2023

github-actions bot commented Jan 29, 2024

Piedone commented Mar 19, 2024

sobotama commented Apr 2, 2024

sobotama commented Apr 2, 2024

Piedone commented Apr 2, 2024

github-actions bot commented Apr 18, 2024

Piedone commented Apr 19, 2024

Piedone left a comment

coderabbitai bot commented Apr 24, 2024 •

edited

Loading

Walkthrough

Changes

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (`.coderabbit.yaml`)

Documentation and Community

Piedone commented Apr 24, 2024

allcontributors bot commented Apr 24, 2024

Piedone commented Apr 24, 2024

github-actions bot commented Apr 24, 2024

allcontributors bot commented Apr 24, 2024

Piedone commented Apr 24, 2024

Validate JavaScript condition in Layer Rule on save (#12901) #12968

Validate JavaScript condition in Layer Rule on save (#12901) #12968

Conversation

sobotama commented Dec 21, 2022

ns8482e Dec 22, 2022

Choose a reason for hiding this comment

sobotama Jan 5, 2023

Choose a reason for hiding this comment

github-actions bot commented Jan 29, 2024

Piedone commented Mar 19, 2024

sobotama commented Apr 2, 2024

sobotama commented Apr 2, 2024

Piedone commented Apr 2, 2024

github-actions bot commented Apr 18, 2024

Piedone commented Apr 19, 2024

Piedone left a comment

Choose a reason for hiding this comment

coderabbitai bot commented Apr 24, 2024 • edited Loading

Walkthrough

Changes

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (.coderabbit.yaml)

Documentation and Community

Piedone commented Apr 24, 2024

allcontributors bot commented Apr 24, 2024

Piedone commented Apr 24, 2024

github-actions bot commented Apr 24, 2024

allcontributors bot commented Apr 24, 2024

Piedone commented Apr 24, 2024

coderabbitai bot commented Apr 24, 2024 •

edited

Loading

CodeRabbit Configration File (`.coderabbit.yaml`)