Skip to content

[UPMERGE] 1.14 -> 2.0#17939

Merged
GSadee merged 12 commits into2.0from
upmerge/1.14_2.0
May 6, 2025
Merged

[UPMERGE] 1.14 -> 2.0#17939
GSadee merged 12 commits into2.0from
upmerge/1.14_2.0

Conversation

@SyliusBot
Copy link
Copy Markdown
Contributor

This PR has been generated automatically.
For more details see upmerge_pr.yaml.

Remember! The upmerge should always be merged with using Merge pull request button.

In case of conflicts, please resolve them manually with usign the following commands:

git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.0 -m "Resolve conflicts between 1.14 and 2.0"

If you use other name for the upstream remote, please replace upstream with the name of your remote pointing to the Sylius/Sylius repository.

Once the conflicts are resolved, please run git merge --continue and push the changes to this PR.

Piotr Tułacz and others added 10 commits May 5, 2025 13:02
| Q               | A
|-----------------|-----
| Branch?         | 1.14 <!-- see the comment below -->
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations? | no <!-- don't forget to update the UPGRADE-*.md file
-->
| Related tickets | -
| License         | MIT

<!--
 - Bug fixes must be submitted against the 1.14 or 2.0 branch
 - Features and deprecations must be submitted against the 2.1 branch
 - Make sure that the correct base branch is set

To be sure you are not breaking any Backward Compatibilities, check the
documentation:

https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html
-->

All requests from `/_profiler` and `/_wdt` are currently part of `shop`
firewall instead of `dev`. It's because the `dev` firewall is defined in
last position and `/_profiler` and `_wdt` are not excluded from
`%sylius.security.shop_regex%`.
Defining it first fixes this issue. 

However, existing projects should also change their config, should I
target 2.1 branch instead and add this change in the `UPGRADE-2.1.md` ?
Added support for displaying Sylius Plus logo in the admin navbar via
menu.
Included an example usage in the Administration section of the main
menu.

![image](https://github.com/user-attachments/assets/2f895c0a-ee3b-435e-bbe8-e281aa2d1842)
Updated plus utm link

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Introduced an "Administration" submenu in the admin sidebar, featuring
a "roles" link with a Sylius Plus badge that opens in a new tab.
- Added a new UI segment on the admin user form showcasing role
selection and a permission checker toggle, highlighting Sylius Plus
features.
- Enhanced sidebar visuals with a Sylius Plus badge and new hover
effects.

- **Style**
- Updated admin panel styles to support new sidebar badge and
interactive blur effects.

- **Bug Fixes**
- Improved navigation reliability after viewing product images in admin
and shop interfaces.

- **Documentation**
- Added new translation entries for roles and permission checker UI
elements.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
@SyliusBot SyliusBot requested review from a team as code owners May 6, 2025 08:22
@probot-autolabeler probot-autolabeler bot added the Admin AdminBundle related issues and PRs. label May 6, 2025
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented May 6, 2025

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

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

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

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 generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this 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.

@github-actions
Copy link
Copy Markdown

github-actions bot commented May 6, 2025

❌ Preview Environment deleted from Bunnyshell

Available commands:

  • 🚀 /bns:deploy to redeploy the environment

@GSadee GSadee merged commit c8934c2 into 2.0 May 6, 2025
27 checks passed
@GSadee GSadee deleted the upmerge/1.14_2.0 branch May 6, 2025 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Admin AdminBundle related issues and PRs.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants