From fef441886333b65c42a365c167c20f2a21a5c955 Mon Sep 17 00:00:00 2001 From: jkindly Date: Thu, 11 Jul 2024 09:26:30 +0200 Subject: [PATCH 1/3] OP-329: init --- src/Menu/ContentManagementMenuBuilder.php | 32 +++++++++---------- src/Resources/config/grids/admin/block.yml | 4 +++ src/Resources/config/grids/admin/page.yml | 15 +++++---- .../views/Block/Crud/_form.html.twig | 2 +- .../views/Media/Crud/_form.html.twig | 8 ++--- src/Resources/views/Page/Crud/_form.html.twig | 4 +-- 6 files changed, 35 insertions(+), 30 deletions(-) diff --git a/src/Menu/ContentManagementMenuBuilder.php b/src/Menu/ContentManagementMenuBuilder.php index a67d28ac..13f50a99 100755 --- a/src/Menu/ContentManagementMenuBuilder.php +++ b/src/Menu/ContentManagementMenuBuilder.php @@ -24,19 +24,11 @@ public function buildMenu(MenuBuilderEvent $menuBuilderEvent): void ; $cmsRootMenuItem - ->addChild('blocks', [ - 'route' => 'bitbag_sylius_cms_plugin_admin_block_index', - ]) - ->setLabel('bitbag_sylius_cms_plugin.ui.blocks') - ->setLabelAttribute('icon', 'block layout') - ; - - $cmsRootMenuItem - ->addChild('media', [ - 'route' => 'bitbag_sylius_cms_plugin_admin_media_index', + ->addChild('collections', [ + 'route' => 'bitbag_sylius_cms_plugin_admin_collection_index', ]) - ->setLabel('bitbag_sylius_cms_plugin.ui.media') - ->setLabelAttribute('icon', 'file') + ->setLabel('bitbag_sylius_cms_plugin.ui.collections') + ->setLabelAttribute('icon', 'grid layout') ; $cmsRootMenuItem @@ -48,11 +40,19 @@ public function buildMenu(MenuBuilderEvent $menuBuilderEvent): void ; $cmsRootMenuItem - ->addChild('collections', [ - 'route' => 'bitbag_sylius_cms_plugin_admin_collection_index', + ->addChild('blocks', [ + 'route' => 'bitbag_sylius_cms_plugin_admin_block_index', ]) - ->setLabel('bitbag_sylius_cms_plugin.ui.collections') - ->setLabelAttribute('icon', 'grid layout') + ->setLabel('bitbag_sylius_cms_plugin.ui.blocks') + ->setLabelAttribute('icon', 'block layout') + ; + + $cmsRootMenuItem + ->addChild('media', [ + 'route' => 'bitbag_sylius_cms_plugin_admin_media_index', + ]) + ->setLabel('bitbag_sylius_cms_plugin.ui.media') + ->setLabelAttribute('icon', 'file') ; } } diff --git a/src/Resources/config/grids/admin/block.yml b/src/Resources/config/grids/admin/block.yml index a1a83f4c..54bc54cd 100755 --- a/src/Resources/config/grids/admin/block.yml +++ b/src/Resources/config/grids/admin/block.yml @@ -9,6 +9,10 @@ sylius_grid: code: asc limits: [10, 25, 50] fields: + name: + type: string + label: bitbag_sylius_cms_plugin.ui.name + sortable: name code: type: string label: sylius.ui.code diff --git a/src/Resources/config/grids/admin/page.yml b/src/Resources/config/grids/admin/page.yml index 854106cb..7a92a2a7 100755 --- a/src/Resources/config/grids/admin/page.yml +++ b/src/Resources/config/grids/admin/page.yml @@ -9,18 +9,19 @@ sylius_grid: code: asc limits: [10, 25, 50] fields: - code: - type: string - label: bitbag_sylius_cms_plugin.ui.code - sortable: ~ name: type: string label: bitbag_sylius_cms_plugin.ui.name sortable: name - slug: + code: type: string - label: bitbag_sylius_cms_plugin.ui.slug - sortable: translation.slug + label: bitbag_sylius_cms_plugin.ui.code + sortable: ~ + enabled: + type: twig + label: sylius.ui.enabled + options: + template: "@SyliusUi/Grid/Field/enabled.html.twig" collections: type: twig label: bitbag_sylius_cms_plugin.ui.collections diff --git a/src/Resources/views/Block/Crud/_form.html.twig b/src/Resources/views/Block/Crud/_form.html.twig index e46f05f7..d6d32632 100755 --- a/src/Resources/views/Block/Crud/_form.html.twig +++ b/src/Resources/views/Block/Crud/_form.html.twig @@ -5,8 +5,8 @@
{{ form_errors(form) }} - {{ form_row(form.code) }} {{ form_row(form.name) }} + {{ form_row(form.code) }} {{ form_row(form.enabled) }} {{ form_row(form.channels) }} {{ form_row(form.locales) }} diff --git a/src/Resources/views/Media/Crud/_form.html.twig b/src/Resources/views/Media/Crud/_form.html.twig index b8f08aa0..39d15b25 100755 --- a/src/Resources/views/Media/Crud/_form.html.twig +++ b/src/Resources/views/Media/Crud/_form.html.twig @@ -8,14 +8,14 @@
- {{ form_row(form.code) }} {{ form_row(form.name) }} + {{ form_row(form.code) }} + {{ form_row(form.enabled) }} + {{ form_row(form.channels) }} + {{ form_row(form.collections) }} {{ form_row(form.type) }} {{ form_row(form.file) }} - {{ form_row(form.enabled) }} {{ form_row(form.saveWithOriginalName) }} - {{ form_row(form.collections) }} - {{ form_row(form.channels) }}
diff --git a/src/Resources/views/Page/Crud/_form.html.twig b/src/Resources/views/Page/Crud/_form.html.twig index 58a44072..db40b48a 100755 --- a/src/Resources/views/Page/Crud/_form.html.twig +++ b/src/Resources/views/Page/Crud/_form.html.twig @@ -8,12 +8,12 @@
+ {{ form_row(form.name) }} {{ form_row(form.code) }} {{ form_row(form.enabled) }} - {{ form_row(form.name) }} - {{ form_row(form.collections) }} {{ form_row(form.channels) }} {{ form_row(form.locales) }} + {{ form_row(form.collections) }} {{ form_row(form.publishAt) }}
From 42b01c1456dbed87d327d49da5eec7a63a11c482 Mon Sep 17 00:00:00 2001 From: jkindly Date: Thu, 11 Jul 2024 10:45:32 +0200 Subject: [PATCH 2/3] OP-329: Forms/elements consistency --- src/Resources/config/grids/admin/collection.yml | 8 ++++---- src/Resources/config/grids/admin/media.yml | 14 +++++++++++--- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/Resources/config/grids/admin/collection.yml b/src/Resources/config/grids/admin/collection.yml index 7a1411a6..f7ed286b 100755 --- a/src/Resources/config/grids/admin/collection.yml +++ b/src/Resources/config/grids/admin/collection.yml @@ -9,6 +9,10 @@ sylius_grid: code: asc limits: [10, 25, 50] fields: + name: + type: string + label: bitbag_sylius_cms_plugin.ui.name + sortable: translation.name code: type: string label: bitbag_sylius_cms_plugin.ui.code @@ -17,10 +21,6 @@ sylius_grid: type: string label: bitbag_sylius_cms_plugin.ui.type sortable: ~ - name: - type: string - label: bitbag_sylius_cms_plugin.ui.name - sortable: translation.name filters: search: type: string diff --git a/src/Resources/config/grids/admin/media.yml b/src/Resources/config/grids/admin/media.yml index e5608163..0ed7a089 100644 --- a/src/Resources/config/grids/admin/media.yml +++ b/src/Resources/config/grids/admin/media.yml @@ -25,12 +25,20 @@ sylius_grid: type: string label: bitbag_sylius_cms_plugin.ui.code sortable: ~ + enabled: + type: twig + label: sylius.ui.enabled + options: + template: "@SyliusUi/Grid/Field/enabled.html.twig" + collections: + type: twig + label: bitbag_sylius_cms_plugin.ui.collections + path: . + options: + template: "@BitBagSyliusCmsPlugin/Grid/Field/collections.html.twig" path: type: string label: bitbag_sylius_cms_plugin.ui.path - type: - type: string - label: bitbag_sylius_cms_plugin.ui.type filters: search: type: string From ce2eef1d5e8cb00906a1de258eb3cecc191ca8a1 Mon Sep 17 00:00:00 2001 From: jkindly Date: Mon, 15 Jul 2024 11:39:47 +0200 Subject: [PATCH 3/3] OP-329: Add channels column in listing, move path to crud form --- src/Form/Type/MediaType.php | 5 +++++ src/Resources/config/grids/admin/block.yml | 6 ++++++ src/Resources/config/grids/admin/media.yml | 9 ++++++--- src/Resources/config/grids/admin/page.yml | 6 ++++++ src/Resources/views/Grid/Field/channels.html.twig | 3 +++ src/Resources/views/Media/Crud/_form.html.twig | 1 + 6 files changed, 27 insertions(+), 3 deletions(-) create mode 100755 src/Resources/views/Grid/Field/channels.html.twig diff --git a/src/Form/Type/MediaType.php b/src/Form/Type/MediaType.php index 82621729..4672b2dd 100644 --- a/src/Form/Type/MediaType.php +++ b/src/Form/Type/MediaType.php @@ -70,6 +70,11 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'multiple' => true, 'expanded' => true, ]) + ->add('path', TextType::class, [ + 'label' => 'bitbag_sylius_cms_plugin.ui.path', + 'disabled' => true, + 'required' => false, + ]) ->add('translations', ResourceTranslationsType::class, [ 'entry_type' => MediaTranslationType::class, ]) diff --git a/src/Resources/config/grids/admin/block.yml b/src/Resources/config/grids/admin/block.yml index 54bc54cd..fefc7f2c 100755 --- a/src/Resources/config/grids/admin/block.yml +++ b/src/Resources/config/grids/admin/block.yml @@ -30,6 +30,12 @@ sylius_grid: path: . options: template: "@BitBagSyliusCmsPlugin/Grid/Field/collections.html.twig" + channels: + type: twig + label: bitbag_sylius_cms_plugin.ui.channels + path: . + options: + template: "@BitBagSyliusCmsPlugin/Grid/Field/channels.html.twig" filters: search: type: string diff --git a/src/Resources/config/grids/admin/media.yml b/src/Resources/config/grids/admin/media.yml index 0ed7a089..a6704c10 100644 --- a/src/Resources/config/grids/admin/media.yml +++ b/src/Resources/config/grids/admin/media.yml @@ -36,9 +36,12 @@ sylius_grid: path: . options: template: "@BitBagSyliusCmsPlugin/Grid/Field/collections.html.twig" - path: - type: string - label: bitbag_sylius_cms_plugin.ui.path + channels: + type: twig + label: bitbag_sylius_cms_plugin.ui.channels + path: . + options: + template: "@BitBagSyliusCmsPlugin/Grid/Field/channels.html.twig" filters: search: type: string diff --git a/src/Resources/config/grids/admin/page.yml b/src/Resources/config/grids/admin/page.yml index 7a92a2a7..ae111795 100755 --- a/src/Resources/config/grids/admin/page.yml +++ b/src/Resources/config/grids/admin/page.yml @@ -28,6 +28,12 @@ sylius_grid: path: . options: template: "@BitBagSyliusCmsPlugin/Grid/Field/collections.html.twig" + channels: + type: twig + label: bitbag_sylius_cms_plugin.ui.channels + path: . + options: + template: "@BitBagSyliusCmsPlugin/Grid/Field/channels.html.twig" filters: search: type: string diff --git a/src/Resources/views/Grid/Field/channels.html.twig b/src/Resources/views/Grid/Field/channels.html.twig new file mode 100755 index 00000000..a91fcd1e --- /dev/null +++ b/src/Resources/views/Grid/Field/channels.html.twig @@ -0,0 +1,3 @@ +{% for channel in data.channels %} + {{ channel.code }} +{% endfor %} diff --git a/src/Resources/views/Media/Crud/_form.html.twig b/src/Resources/views/Media/Crud/_form.html.twig index 39d15b25..8ff3b5da 100755 --- a/src/Resources/views/Media/Crud/_form.html.twig +++ b/src/Resources/views/Media/Crud/_form.html.twig @@ -16,6 +16,7 @@ {{ form_row(form.type) }} {{ form_row(form.file) }} {{ form_row(form.saveWithOriginalName) }} + {{ form_row(form.path) }}