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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0cf8fe
[Template Events] Part of new UI bundle events
ernestWarwas Jun 21, 2022
5baf53c
[Template][Events] Use already created event in login form
ernestWarwas Jun 23, 2022
26180fc
[Template][Events] Fix for displaying filters
ernestWarwas Jun 23, 2022
76208b4
[Template][Events] Changed names of events
ernestWarwas Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,33 @@ sylius_ui:
priority: 5
context:
event: sylius.admin.layout.topbar_right

sylius.admin.grid.filters:
blocks:
title:
template: "@SyliusUi/Grid/Filter/_title.html.twig"
priority: 20
content:
template: "@SyliusUi/Grid/Filter/_content.html.twig"
priority: 10

sylius.admin.grid.content:
ernestWarwas marked this conversation as resolved.
Show resolved Hide resolved
blocks:
content:
template: "@SyliusUi/Grid/_content.html.twig"
priority: 10

sylius.admin.grid.body:
blocks:
navigation:
template: "@SyliusUi/Grid/_navigation.html.twig"
ernestWarwas marked this conversation as resolved.
Show resolved Hide resolved
priority: 30
table:
template: "@SyliusUi/Grid/_table.html.twig"
priority: 20
pagination:
template: "@SyliusUi/Grid/_pagination.html.twig"
priority: 10

sylius.admin.order.update.form:
blocks:
Expand All @@ -261,8 +288,15 @@ sylius_ui:
blocks:
legacy:
template: "@SyliusUi/Block/_legacySonataEvent.html.twig"
priority: 30
context:
event: sylius.admin.login.before_form
logo:
template: "@SyliusUi/Security/_logo.html.twig"
priority: 20
error:
template: "@SyliusUi/Security/_error.html.twig"
priority: 10

sylius.admin.login.form:
blocks:
Expand Down Expand Up @@ -332,6 +366,15 @@ sylius_ui:
priority: 5
context:
event: sylius.admin.login.after_content

sylius.admin.login.form.content:
blocks:
credentials:
template: "@SyliusUi/Security/Form/_credentials.html.twig"
priority: 20
submit:
template: "@SyliusUi/Security/Form/_submit.html.twig"
priority: 10

sylius.admin.dashboard.header.content:
blocks:
Expand Down
20 changes: 20 additions & 0 deletions src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/_content.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %}

{% if definition.enabledFilters|length > 0 %}
<div class="ui hidden divider"></div>
<div class="ui styled fluid accordion">
<div class="content {% if criteria is not null %}active{% endif %}">
<form method="get" action="{{ path }}" class="ui loadable form" novalidate>
<div class="sylius-filters">
{% for filter in definition.enabledFilters|filter(filter => filter.enabled)|sort_by('position') %}
<div class="sylius-filters__field">
{{ sylius_grid_render_filter(grid, filter) }}
</div>
{% endfor %}
</div>
{{ buttons.filter() }}
{{ buttons.resetFilters(path) }}
</form>
</div>
</div>
{% endif %}
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/UiBundle/Resources/views/Grid/Filter/_title.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<div class="title {% if criteria is not null %}active{% endif %}">
<i class="dropdown icon"></i>
<i class="filter icon"></i>
{{ 'sylius.ui.filters'|trans }}
</div>
12 changes: 12 additions & 0 deletions src/Sylius/Bundle/UiBundle/Resources/views/Grid/_content.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{% set definition = grid.definition %}
{% set data = grid.data %}

{% set path = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %}
{% set criteria = app.request.query.get('criteria') %}

{{ sylius_template_event('sylius.admin.grid.filters', _context) }}

<div class="ui hidden divider"></div>
<div class="sylius-grid-wrapper">
{{ sylius_template_event('sylius.admin.grid.body', _context) }}
ernestWarwas marked this conversation as resolved.
Show resolved Hide resolved
</div>
78 changes: 1 addition & 77 deletions src/Sylius/Bundle/UiBundle/Resources/views/Grid/_default.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1 @@
{% import '@SyliusUi/Macro/pagination.html.twig' as pagination %}
{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %}
{% import '@SyliusUi/Macro/messages.html.twig' as messages %}
{% import '@SyliusUi/Macro/table.html.twig' as table %}

{% set definition = grid.definition %}
{% set data = grid.data %}

{% set path = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %}
{% set criteria = app.request.query.get('criteria') %}

{% if definition.enabledFilters|length > 0 %}
<div class="ui hidden divider"></div>
<div class="ui styled fluid accordion">
<div class="title {% if criteria is not null %}active{% endif %}">
<i class="dropdown icon"></i>
<i class="filter icon"></i>
{{ 'sylius.ui.filters'|trans }}
</div>
<div class="content {% if criteria is not null %}active{% endif %}">
<form method="get" action="{{ path }}" class="ui loadable form" novalidate>
<div class="sylius-filters">
{% for filter in definition.enabledFilters|filter(filter => filter.enabled)|sort_by('position') %}
<div class="sylius-filters__field">
{{ sylius_grid_render_filter(grid, filter) }}
</div>
{% endfor %}
</div>
{{ buttons.filter() }}
{{ buttons.resetFilters(path) }}
</form>
</div>
</div>
{% endif %}

<div class="ui hidden divider"></div>
<div class="sylius-grid-wrapper">
<div class="sylius-grid-nav">
{% if data|length > 0 and definition.actionGroups.bulk is defined and definition.getEnabledActions('bulk')|length > 0 %}
<div class="sylius-grid-nav__bulk">
{% for action in definition.getEnabledActions('bulk') %}
{{ sylius_grid_render_bulk_action(grid, action, null) }}
{% endfor %}
</div>
{% endif %}
<div class="sylius-grid-nav__pagination">
{{ pagination.simple(data) }}
</div>
{% if definition.limits|length > 1 and data|length > min(definition.limits) %}
<div class="sylius-grid-nav__perpage">
<div class="ui fluid one menu sylius-paginate">
{{ pagination.perPage(data, definition.limits) }}
</div>
</div>
{% endif %}
</div>

{% if data|length > 0 %}
<div class="ui segment spaceless sylius-grid-table-wrapper">
<table class="ui sortable stackable very basic celled table" {{ sylius_test_html_attribute('grid-table') }}>
<thead>
<tr>
{{ table.headers(grid, definition, app.request.attributes) }}
</tr>
</thead>
<tbody {{ sylius_test_html_attribute('grid-table-body') }}>
{% for row in data %}
{{ table.row(grid, definition, row) }}
{% endfor %}
</tbody>
</table>
</div>
{% else %}
{{ messages.info('sylius.ui.no_results_to_display') }}
{% 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 😃

21 changes: 21 additions & 0 deletions src/Sylius/Bundle/UiBundle/Resources/views/Grid/_navigation.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{% import '@SyliusUi/Macro/pagination.html.twig' as pagination %}

<div class="sylius-grid-nav">
{% if data|length > 0 and definition.actionGroups.bulk is defined and definition.getEnabledActions('bulk')|length > 0 %}
<div class="sylius-grid-nav__bulk">
{% for action in definition.getEnabledActions('bulk') %}
{{ sylius_grid_render_bulk_action(grid, action, null) }}
{% endfor %}
</div>
{% endif %}
<div class="sylius-grid-nav__pagination">
{{ pagination.simple(data) }}
</div>
{% if definition.limits|length > 1 and data|length > min(definition.limits) %}
<div class="sylius-grid-nav__perpage">
<div class="ui fluid one menu sylius-paginate">
{{ pagination.perPage(data, definition.limits) }}
</div>
</div>
{% endif %}
</div>
3 changes: 3 additions & 0 deletions src/Sylius/Bundle/UiBundle/Resources/views/Grid/_pagination.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% import '@SyliusUi/Macro/pagination.html.twig' as pagination %}

{{ pagination.simple(data) }}
21 changes: 21 additions & 0 deletions src/Sylius/Bundle/UiBundle/Resources/views/Grid/_table.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{% import '@SyliusUi/Macro/table.html.twig' as table %}
{% import '@SyliusUi/Macro/messages.html.twig' as messages %}

{% if data|length > 0 %}
<div class="ui segment spaceless sylius-grid-table-wrapper">
<table class="ui sortable stackable very basic celled table" {{ sylius_test_html_attribute('grid-table') }}>
<thead>
<tr>
{{ table.headers(grid, definition, app.request.attributes) }}
</tr>
</thead>
<tbody {{ sylius_test_html_attribute('grid-table-body') }}>
{% for row in data %}
{{ table.row(grid, definition, row) }}
{% endfor %}
</tbody>
</table>
</div>
{% else %}
{{ messages.info('sylius.ui.no_results_to_display') }}
{% endif %}
4 changes: 4 additions & 0 deletions src/Sylius/Bundle/UiBundle/Resources/views/Security/Form/_credentials.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{{ form_row(form._username, {'value': last_username|default('')}) }}
{{ form_row(form._password) }}
{{ form_row(form._remember_me) }}
<input type="hidden" name="_csrf_admin_security_token" value="{{ csrf_token('admin_authenticate') }}">
1 change: 1 addition & 0 deletions src/Sylius/Bundle/UiBundle/Resources/views/Security/Form/_submit.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<button type="submit" class="ui fluid large primary submit button">Login</button>
7 changes: 7 additions & 0 deletions src/Sylius/Bundle/UiBundle/Resources/views/Security/_error.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{% import '@SyliusUi/Macro/messages.html.twig' as messages %}

{% if last_error %}
<div class="ui left aligned basic segment">
{{ messages.error(last_error.messageKey) }}
</div>
{% endif %}
27 changes: 3 additions & 24 deletions src/Sylius/Bundle/UiBundle/Resources/views/Security/_login.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,13 @@
{% form_theme form '@SyliusUi/Form/theme.html.twig' %}

{% import '@SyliusUi/Macro/messages.html.twig' as messages %}

<div class="ui middle aligned center aligned grid">
<div class="column">
{{ sylius_template_event('sylius.admin.login.before_form', {'form': form}) }}

{% if paths.logo is defined %}
<div style="max-width: 270px; margin: 0 auto; margin-bottom: 40px;">
<img src="{{ asset(paths.logo) }}" class="ui fluid image" id="logo">
</div>
{% endif %}

{% if last_error %}
<div class="ui left aligned basic segment">
{{ messages.error(last_error.messageKey) }}
</div>
{% endif %}
{{ sylius_template_event('sylius.admin.login.before_form', _context) }}

{{ form_start(form, {'action': action|default('/'), 'attr': {'class': 'ui large loadable form', 'novalidate': 'novalidate'}}) }}
<div class="ui left aligned very padded segment">
{{ form_row(form._username, {'value': last_username|default('')}) }}
{{ form_row(form._password) }}
{{ form_row(form._remember_me) }}
<input type="hidden" name="_csrf_admin_security_token" value="{{ csrf_token('admin_authenticate') }}">
<button type="submit" class="ui fluid large primary submit button">Login</button>
{{ sylius_template_event('sylius.admin.login.form.content', _context) }}
ernestWarwas marked this conversation as resolved.
Show resolved Hide resolved
</div>

{{ sylius_template_event('sylius.admin.login.form', {'form': form}) }}
ernestWarwas marked this conversation as resolved.
Show resolved Hide resolved

{{ form_end(form, {'render_rest': false}) }}
{{ form_end(form) }}
</div>
</div>
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/UiBundle/Resources/views/Security/_logo.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{% if paths.logo is defined %}
<div style="max-width: 270px; margin: 0 auto; margin-bottom: 40px;">
<img src="{{ asset(paths.logo) }}" class="ui fluid image" id="logo">
</div>
{% endif %}