From f1ad2ce2aaa3e6d08a6f813eb6230818ac4dd97a Mon Sep 17 00:00:00 2001 From: jkindly Date: Thu, 19 Sep 2024 13:21:14 +0200 Subject: [PATCH] OP-545: Behat fix --- .../assets/admin/js/cms/cms-content-configuration.js | 5 ++++- src/Resources/assets/admin/js/cms/cms-template.js | 9 +++++---- src/Resources/assets/admin/js/index.js | 2 +- src/Resources/config/routing/admin/template.yml | 2 +- src/Resources/views/ContentTemplate/form.html.twig | 2 +- tests/Behat/Page/Admin/Block/CreatePage.php | 4 ++-- tests/Behat/Page/Admin/Page/CreatePage.php | 4 ++-- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/Resources/assets/admin/js/cms/cms-content-configuration.js b/src/Resources/assets/admin/js/cms/cms-content-configuration.js index 1320437a..a0754cca 100644 --- a/src/Resources/assets/admin/js/cms/cms-content-configuration.js +++ b/src/Resources/assets/admin/js/cms/cms-content-configuration.js @@ -110,7 +110,10 @@ $(document).ready(function() { const textareaId = `${collectionHolder}_${index}_configuration_textarea`; element.id = textareaId; - CKEDITOR.replace(textareaId, ckeditorConfig); + + if (typeof CKEDITOR !== 'undefined') { + CKEDITOR.replace(textareaId, ckeditorConfig); + } } }); } diff --git a/src/Resources/assets/admin/js/cms/cms-template.js b/src/Resources/assets/admin/js/cms/cms-template.js index 87d631dc..e2033b1e 100644 --- a/src/Resources/assets/admin/js/cms/cms-template.js +++ b/src/Resources/assets/admin/js/cms/cms-template.js @@ -1,9 +1,9 @@ export class HandleTemplate { init() { $(document).ready(() => { - const cmsLoadTemplate = $('[data-bb-cms-load-template]'); - const cmsPageTemplate = $('#sylius_cms_page_template'); - const cmsBlockTemplate = $('#sylius_cms_block_template'); + const cmsLoadTemplate = $('[data-bb-cms-load-content-template]'); + const cmsPageTemplate = $('#sylius_cms_page_contentTemplate'); + const cmsBlockTemplate = $('#sylius_cms_block_contentTemplate'); let locales = []; $('.locale-selector option').each(function() { @@ -28,7 +28,7 @@ export class HandleTemplate { return; } - const endpointUrl = cmsLoadTemplate.data('bb-cms-load-template').replace('REPLACE_ID', templateId); + const endpointUrl = cmsLoadTemplate.data('bb-cms-load-content-template').replace('REPLACE_ID', templateId); if (!endpointUrl) { return; } @@ -52,6 +52,7 @@ export class HandleTemplate { let idx = 0; $.each(data.content, function (index, element) { locales.forEach(function (locale) { + console.log(locale); elements.eq(idx).find('select:first').val(element.type); elements.eq(idx).find('select:first').change(); elements.eq(idx).find('input[name$="[locale]"]').val(locale); diff --git a/src/Resources/assets/admin/js/index.js b/src/Resources/assets/admin/js/index.js index a3587190..19cd8bf6 100644 --- a/src/Resources/assets/admin/js/index.js +++ b/src/Resources/assets/admin/js/index.js @@ -27,6 +27,6 @@ if (document.querySelector('.collection-type-items')) { new HandleChooseCollectionType().init(); } -if (document.querySelector('[data-bb-cms-load-template]')) { +if (document.querySelector('[data-bb-cms-load-content-template]')) { new HandleTemplate().init(); } diff --git a/src/Resources/config/routing/admin/template.yml b/src/Resources/config/routing/admin/template.yml index 33d2d8ad..9ce48ee6 100755 --- a/src/Resources/config/routing/admin/template.yml +++ b/src/Resources/config/routing/admin/template.yml @@ -10,7 +10,7 @@ sylius_cms_admin_template: vars: all: templates: - form: "@SyliusCmsPlugin/Template/Crud/_form.html.twig" + form: "@SyliusCmsPlugin/ContentTemplate/Crud/_form.html.twig" index: icon: block layout type: sylius.resource diff --git a/src/Resources/views/ContentTemplate/form.html.twig b/src/Resources/views/ContentTemplate/form.html.twig index 0b8d0e5d..6c15d012 100644 --- a/src/Resources/views/ContentTemplate/form.html.twig +++ b/src/Resources/views/ContentTemplate/form.html.twig @@ -3,7 +3,7 @@
{{ form_row(form.contentTemplate) }} - +
diff --git a/tests/Behat/Page/Admin/Block/CreatePage.php b/tests/Behat/Page/Admin/Block/CreatePage.php index 5098fdcf..23a6528f 100755 --- a/tests/Behat/Page/Admin/Block/CreatePage.php +++ b/tests/Behat/Page/Admin/Block/CreatePage.php @@ -300,8 +300,8 @@ protected function getDefinedElements(): array 'association_dropdown_collection' => '.field > label:contains("Collections") ~ .sylius-autocomplete', 'association_dropdown_collection_item' => '.field > label:contains("Collections") ~ .sylius-autocomplete > div.menu > div.item:contains("%item%")', 'content_elements_add_button' => '#sylius_cms_block_contentElements a[data-form-collection="add"]', - 'template_select_dropdown' => 'h5:contains("Use page template") ~ .column .field > .sylius-autocomplete', - 'template_select_dropdown_item' => 'h5:contains("Use page template") ~ .column .field > .sylius-autocomplete > div.menu > div.item:contains("%item%")', + 'template_select_dropdown' => 'h5:contains("Content elements template") ~ .column .field > .sylius-autocomplete', + 'template_select_dropdown_item' => 'h5:contains("Content elements template") ~ .column .field > .sylius-autocomplete > div.menu > div.item:contains("%item%")', ], ); } diff --git a/tests/Behat/Page/Admin/Page/CreatePage.php b/tests/Behat/Page/Admin/Page/CreatePage.php index 83f983cd..22580b85 100755 --- a/tests/Behat/Page/Admin/Page/CreatePage.php +++ b/tests/Behat/Page/Admin/Page/CreatePage.php @@ -310,8 +310,8 @@ protected function getDefinedElements(): array 'association_dropdown_collection' => '.field > label:contains("Collections") ~ .sylius-autocomplete', 'association_dropdown_collection_item' => '.field > label:contains("Collections") ~ .sylius-autocomplete > div.menu > div.item:contains("%item%")', 'content_elements_add_button' => '#sylius_cms_page_contentElements a[data-form-collection="add"]', - 'template_select_dropdown' => 'h5:contains("Use page template") ~ .column .field > .sylius-autocomplete', - 'template_select_dropdown_item' => 'h5:contains("Use page template") ~ .column .field > .sylius-autocomplete > div.menu > div.item:contains("%item%")', + 'template_select_dropdown' => 'h5:contains("Content elements template") ~ .column .field > .sylius-autocomplete', + 'template_select_dropdown_item' => 'h5:contains("Content elements template") ~ .column .field > .sylius-autocomplete > div.menu > div.item:contains("%item%")', ], ); }