Skip to content

[UPMERGE] 2.0 -> 2.1#17904

Merged
GSadee merged 4 commits into2.1from
upmerge/2.0_2.1
Apr 29, 2025
Merged

[UPMERGE] 2.0 -> 2.1#17904
GSadee merged 4 commits into2.1from
upmerge/2.0_2.1

Conversation

@SyliusBot
Copy link
Copy Markdown
Contributor

@SyliusBot SyliusBot commented Apr 25, 2025 •
edited by coderabbitai bot
Loading

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.1 -m "Resolve conflicts between 2.0 and 2.1"

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.

Summary by CodeRabbit

  • Style
    • Improved alignment and layout of promotion usage information and progress bar for better visual consistency in the admin interface.

Piotr Tułacz and others added 4 commits April 14, 2025 10:24
Fix cart promotions usage column
2948794
[CS][DX] Refactor
9ad69a9
@mpysiak
[CS][DX] Refactor (#17897)
6976ab9 
This PR has been generated automatically.
For more details see
[refactor.yaml](/Sylius/Sylius/blob/2.1/.github/workflows/refactor.yaml).
@GSadee
[Admin] Fix cart promotions usage column (#17873)
adf0ed0 
![image](https://github.com/user-attachments/assets/9d6582c6-1a78-40c1-b67a-b8f760ef9c41)

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

## Summary by CodeRabbit

- **Documentation**  
- Updated installation requirements to include the PHP sodium extension.

- **Style/UX Improvements**  
- Refined promotional grid layout for improved alignment and
readability.
  - Enhanced icon handling to prevent missing icon issues.

- **Chores**  
- Made several internal improvements that streamline checkout and order
management, contributing to a more reliable user experience.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
@SyliusBot SyliusBot requested review from a team as code owners April 25, 2025 02:32
@probot-autolabeler probot-autolabeler bot added Admin AdminBundle related issues and PRs. API APIs related issues and PRs. labels Apr 25, 2025
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 25, 2025 •
edited
Loading

Walkthrough

This update introduces changes to a Twig template and a PHP file. The template modification adjusts the alignment and layout of elements based on the presence of a usage limit, switching between horizontal and vertical flex layouts for improved content arrangement. The PHP file update standardizes the string concatenation syntax used for dynamic method calls, adding spaces around the concatenation operator for readability. No changes to public interfaces or exported entities are present.

Changes

File(s) Change Summary
src/Sylius/Bundle/AdminBundle/templates/promotion/grid/field/usage.html.twig Updated flexbox classes: centers content when usage limit is absent, switches to vertical layout when present.
src/Sylius/Bundle/ApiBundle/OpenApi/Documentation/AcceptLanguageHeaderDocumentationModifier.php Reformatted string concatenation in dynamic method name construction for clarity; logic unchanged.

Suggested reviewers

  • mpsyiak

Poem

In the fields of code where rabbits play,
Flex layouts shift and strings give way.
Vertical or centered, all aligns just right,
Concatenation clearer, code shining bright.
With every hop, the changes grow—
A tidier garden for all to know!
🐇✨

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 216663f and adf0ed0.

📒 Files selected for processing (2)
  • src/Sylius/Bundle/AdminBundle/templates/promotion/grid/field/usage.html.twig (2 hunks)
  • src/Sylius/Bundle/ApiBundle/OpenApi/Documentation/AcceptLanguageHeaderDocumentationModifier.php (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (4)
  • GitHub Check: Static checks / PHP 8.3, Symfony ^7.2
  • GitHub Check: Static checks / PHP 8.2, Symfony ^6.4
  • GitHub Check: Static checks / PHP 8.3, Symfony ^7.1
  • GitHub Check: Static checks / PHP 8.2, Symfony ^6.4
🔇 Additional comments (3)
src/Sylius/Bundle/ApiBundle/OpenApi/Documentation/AcceptLanguageHeaderDocumentationModifier.php (1)

64-64: Consistent PSR-12 concatenation spacing
Adding spaces around the . operator improves readability and aligns with PSR-12 coding style. No behavior change.

src/Sylius/Bundle/AdminBundle/templates/promotion/grid/field/usage.html.twig (2)

2-4: Center unlimited-usage indicator
The new justify-content-center class ensures the “∞” usage display is horizontally centered for cases without a limit. UX alignment improvement looks good.

14-19: Vertical stacking of progress bar and text
Switching to flex-column align-items-center gap-2 neatly stacks and centers the progress bar and usage text, improving readability in narrow table cells.

✨ Finishing Touches
  • 📝 Generate Docstrings

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.

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 Apr 25, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands:

  • 🚀 /bns:deploy to redeploy the environment

@GSadee GSadee merged commit 6d5eb0d into 2.1 Apr 29, 2025
78 checks passed
@GSadee GSadee deleted the upmerge/2.0_2.1 branch April 29, 2025 11:19
@coderabbitai coderabbitai bot mentioned this pull request Sep 24, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GSadee GSadee GSadee approved these changes

Assignees

No one assigned

Labels

Admin AdminBundle related issues and PRs. API APIs related issues and PRs.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@SyliusBot @GSadee @mpysiak