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.

Sign up for GitHub

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

Jump to bottom

[Template][Events] Part of new UI bundle events for security and grid #14101

Merged
merged 4 commits into from
Jun 23, 2022
Merged

[Template][Events] Part of new UI bundle events for security and grid #14101

merged 4 commits into from
Jun 23, 2022

Conversation

ernestWarwas
Copy link
Contributor

Q A
Branch? master
Bug fix? no
New feature? no
BC breaks? no
Deprecations? no
License MIT

@probot-autolabeler probot-autolabeler bot added the Admin AdminBundle related issues and PRs. label Jun 22, 2022
@ernestWarwas ernestWarwas marked this pull request as ready for review June 22, 2022 12:12
@ernestWarwas ernestWarwas requested a review from a team as a code owner June 22, 2022 12:12
GSadee
GSadee reviewed Jun 23, 2022
View reviewed changes
Copy link
Member

@GSadee GSadee left a comment

Choose a reason for hiding this comment

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

Change the base branch to 1.11

src/Sylius/Bundle/UiBundle/Resources/views/Security/_login.html.twig Outdated Show resolved Hide resolved
@ernestWarwas ernestWarwas changed the base branch from master to 1.11 June 23, 2022 08:34
@ernestWarwas ernestWarwas changed the base branch from 1.11 to master June 23, 2022 08:34
@ernestWarwas ernestWarwas changed the base branch from master to 1.11 June 23, 2022 08:39
lchrusciel
lchrusciel reviewed Jun 23, 2022
View reviewed changes
src/Sylius/Bundle/UiBundle/Resources/views/Grid/_content.html.twig Outdated Show resolved Hide resolved
src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml Outdated Show resolved Hide resolved
src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml Outdated Show resolved Hide resolved
src/Sylius/Bundle/UiBundle/Resources/views/Grid/_default.html.twig Outdated
{% endif %}
{{ pagination.simple(data) }}
</div>
{{ sylius_template_event('sylius.admin.grid.content', _context) }}
Copy link
Member

Choose a reason for hiding this comment

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

We could think about more then one event being triggered here, like generic grid, admin/shop and resource if exists. You may check how it may be done here for example here: src/Sylius/Bundle/AdminBundle/Resources/views/Crud/create.html.twig

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok, I will do it in separate PR 😃

@ernestWarwas
[Template][Events] Changed names of events
76208b4 
[Template][Events] Changed names of events

[Template][Events] Changed names of events

[Template][Events] Changed names of events

order changed

fix BC

fix render rest
@lchrusciel lchrusciel added DX Issues and PRs aimed at improving Developer eXperience. Shop ShopBundle related issues and PRs. labels Jun 23, 2022
@Zales0123 Zales0123 merged commit 237657e into Sylius:1.11 Jun 23, 2022
@Zales0123
Copy link
Member

Thanks, Ernest! 🎉

lchrusciel
lchrusciel reviewed Jun 24, 2022
View reviewed changes
src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml
Comment on lines +239 to +261
sylius.grid:
blocks:
content:
template: "@SyliusUi/Grid/_content.html.twig"
priority: 10

sylius.grid.body:
blocks:
navigation:
template: "@SyliusUi/Grid/Body/_navigation.html.twig"
priority: 30
table:
template: "@SyliusUi/Grid/Body/_table.html.twig"
priority: 20
pagination:
template: "@SyliusUi/Grid/Body/_pagination.html.twig"
priority: 10

sylius.grid.filters:
blocks:
content:
template: "@SyliusUi/Grid/Filter/_content.html.twig"
priority: 10
Copy link
Member

Choose a reason for hiding this comment

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

These configs have to go to UiBundle

@GSadee GSadee mentioned this pull request Jun 24, 2022
Merged
Zales0123 referenced this pull request Jun 24, 2022
@Zales0123
bug #14108 [Templates] Move grid events to UI bundle (GSadee)
3f77414 
This PR was merged into the 1.11 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.11|
| Bug fix?        | yes                                                       |
| New feature?    | no                                                      |
| BC breaks?      | no                                                      |
| Deprecations?   | no|
| Related tickets | fixes https://github.com/Sylius/Sylius/pull/14101|
| License         | MIT                                                          |

<!--
 - Bug fixes must be submitted against the 1.10 or 1.11 branch(the lowest possible)
 - Features and deprecations must be submitted against the master 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
-->


Commits
-------

58e66f9 [Templates] Move grid events to UI bundle
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lchrusciel lchrusciel lchrusciel approved these changes

@Zales0123 Zales0123 Zales0123 approved these changes

@GSadee GSadee GSadee approved these changes

Assignees
No one assigned
Labels
Admin AdminBundle related issues and PRs. DX Issues and PRs aimed at improving Developer eXperience. Shop ShopBundle related issues and PRs.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ernestWarwas @Zales0123 @GSadee @lchrusciel