+Almost every eCommerce app has to present some content. Managing it is often done via third-party libraries like WordPress,
+eZ Platform, or a built-in content management system. As Sylius does not have a CMS in the standard platform,
+we decided to develop our own, which will be as flexible as Sylius. This plugin allows you to add dynamic blocks and pages
+with content elements to your storefront.
- [Use Case](doc/use_case.md)
+ - [Collections](doc/use_case_collections.md)
+ - [Templates](doc/use_case_templates.md)
+ - [Pages](doc/use_case_pages.md)
+ - [Blocks](doc/use_case_blocks.md)
+ - [Media](doc/use_case_media.md)
- [Installation](doc/installation.md)
- [Upgrading](UPGRADE.md)
-- [Blocks](doc/blocks.md)
+- [Collections](doc/collections.md)
+- [Templates](doc/templates.md)
- [Pages](doc/pages.md)
-- [Sections](doc/sections.md)
+- [Blocks](doc/blocks.md)
- [Media](doc/media.md)
-- [FAQs](doc/faqs.md)
- [Fixtures](doc/fixtures.md)
- [WYSIWYG](doc/wysiwyg.md)
- [Importing resources](doc/importing-resources.md)
-- [Using Twig functions in the admin panel](doc/twig-functions-in-admin.md)
- [Sitemap](doc/sitemap.md)
- [Customization](doc/customization.md)
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
new file mode 100644
index 000000000..dcd239384
--- /dev/null
+++ b/UPGRADE-5.0.md
@@ -0,0 +1,105 @@
+# UPGRADE FROM 4.2 TO 5.0
+
+This upgrade is a major one, as it introduces a new feature - [Content Elements](doc/content_elements.md)
+and removes the old way of creating blocks and pages.
+
+* A lot of database modifications has been made. Read the below changelog first and then migrate your structure using
+ `bin/console doctrine:migrations:diff && bin/console doctrine:migrations:migrate` commands.
+* Sections are now Collections, as it was a more suitable name for the feature.
+* Pages and Blocks now have `Content elements` segment, where you can add elements to the page or block.
+* Removed FAQ, as you can now create a FAQ page with the new content elements.
+* Added new `Templates` section where you can create templates for your content elements. Read more about it in [Use case templates](doc/use_case_templates.md)
+and [Templates](doc/templates.md) docs.
+* Removed CKEditor deprecation modal.
+* Reordered forms/elements for functionality consistency.
+* Updated import functionality to work with the new structure.
+* Updated fixtures to work with the new structure
+* Removed `sylius_cms_render_product_pages` twig extension.
+* Removed support for rendering twig functions in WYSIWYG editor.
+* Added twig extensions:
+ * `sylius_cms_render_collection`
+ * `sylius_cms_render_content_elements`
+
+## Briefly about Content Elements
+
+Content elements is a new segment in the block/page form where you can add elements that will be rendered on the store's frontend, like:
+* Textarea
+* Heading
+* Images
+* Products carousel
+* etc.
+
+> Read more about the content elements in the updated [Content elements](doc/content_elements.md) doc.
+
+## Changes in Collections (old Sections)
+
+### Added fields:
+
+* Type
+* Pages/Block/Media (depending on the chosen type)
+
+### Moved fields:
+
+* Name field has been moved from translations to the main settings tab
+
+> Read more about the collections in the updated [Use case collections](doc/use_case_collections.md) and [Collections](doc/collections.md) docs.
+
+## Changes in Pages
+
+### Removed fields:
+
+* Products
+* Breadcrumb
+* Name when linked
+* Description when linked
+* Image
+* Content
+* Title
+
+### Added fields
+
+* Teaser title
+* Teaser content
+* Teaser image
+
+### Moved fields
+
+* Name field has been moved from translations to the main settings tab
+
+> Read more about the pages in the updated [Use case pages](doc/use_case_pages.md) and [Pages](doc/pages.md) docs.
+
+## Changes in Blocks
+
+### Removed fields:
+
+* Products
+* Taxons
+* Whole translations tab
+
+### Added fields
+
+* Name
+* Locales
+* Display for products
+* Display for products in taxons
+* Display for taxons
+
+> Read more about the blocks in the updated [Use case blocks](doc/use_case_blocks.md) and [Blocks](doc/blocks.md) docs.
+
+## Changes in Media
+
+### Removed fields:
+
+* Products
+
+### Added fields
+
+* Media preview with path
+
+### Moved fields
+
+* Name field has been moved from translations to the main settings tab
+
+### Renamed fields
+
+* Content -> Link content
diff --git a/UPGRADE.md b/UPGRADE.md
index 0e3db3428..b04679a0c 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -19,7 +19,7 @@ structure using `bin/console doctrine:migrations:diff && bin/console doctrine:mi
use raw content in [WYSIWYG editor](doc/wysiwyg.md)
* Chanel awareness has been added to pages, blocks, FAQs, sections and media. That being said, many
repository methods changed their signatures. In case you customized them in your src, check
-new signatures in interfaces under [BitBag\SyliusCmsPlugin\Repository](src/Repository) namespace
+new signatures in interfaces under [Sylius\CmsPlugin\Repository](src/Repository) namespace
* WYSIWYG editor has been introduced. You will need to import it in your AppKernel and install
its assets. For more, check the [installation guide](doc/installation.md)
* Sitemap support was added, you will need to enable extra bundle in your AppKernel. Read more
diff --git a/behat.yml.dist b/behat.yml.dist
index 6c02a541e..b3bfe96cc 100755
--- a/behat.yml.dist
+++ b/behat.yml.dist
@@ -47,7 +47,7 @@ default:
FriendsOfBehat\SymfonyExtension:
bootstrap: tests/Application/config/bootstrap.php
kernel:
- class: Tests\BitBag\SyliusCmsPlugin\Application\Kernel
+ class: Tests\Sylius\CmsPlugin\Application\Kernel
FriendsOfBehat\VariadicExtension: ~
diff --git a/composer.json b/composer.json
index 6f32f2416..4d334066f 100644
--- a/composer.json
+++ b/composer.json
@@ -9,11 +9,10 @@
"description": "CMS plugin for Sylius applications.",
"license": "MIT",
"require": {
- "php": "^8.0",
+ "php": "^8.1",
"sylius/sylius": "^1.12.0 || ^1.13.0",
"league/csv": "^9.1",
"friendsofsymfony/ckeditor-bundle": "^2.0",
- "instaclick/php-webdriver": "^1.4",
"symfony/webpack-encore-bundle": "^1.12"
},
"require-dev": {
@@ -31,6 +30,7 @@
"friends-of-behat/suite-settings-extension": "^1.0",
"friends-of-behat/symfony-extension": "^2.1",
"friends-of-behat/variadic-extension": "^1.3",
+ "instaclick/php-webdriver": "^1.4",
"lchrusciel/api-test-case": "^4.1 || ^5.0",
"matthiasnoback/symfony-config-test": "^5.1",
"phpspec/phpspec": "^7.2",
@@ -51,26 +51,19 @@
"symfony/runtime": "^5.4 || ^6.4",
"symfony/web-profiler-bundle": "^5.4 || ^6.4"
},
- "conflict": {
- "symfony/symfony": "4.1.8",
- "symfony/browser-kit": "4.1.8",
- "symfony/dom-crawler": "4.1.8",
- "symfony/routing": "4.1.8",
- "symfony/doctrine-bridge": "4.4.16"
- },
"suggest": {
- "stefandoorn/sitemap-plugin": "^2.0@alpha"
+ "stefandoorn/sitemap-plugin": "^2.2"
},
"prefer-stable": true,
"autoload": {
"psr-4": {
- "BitBag\\SyliusCmsPlugin\\": "src/",
- "Tests\\BitBag\\SyliusCmsPlugin\\": "tests/"
+ "Sylius\\CmsPlugin\\": "src/",
+ "Tests\\Sylius\\CmsPlugin\\": "tests/"
}
},
"autoload-dev": {
"psr-4": {
- "spec\\BitBag\\SyliusCmsPlugin\\": "spec/"
+ "spec\\Sylius\\CmsPlugin\\": "spec/"
},
"classmap": ["tests/Application/Kernel.php"]
},
diff --git a/doc/01.1-webpack-config.md b/doc/01.1-webpack-config.md
index 8f2858c77..5252c5524 100644
--- a/doc/01.1-webpack-config.md
+++ b/doc/01.1-webpack-config.md
@@ -1,4 +1,4 @@
-# BitBag SyliusCmsPlugin
+# SyliusCmsPlugin
- [⬅️ Back](./installation.md)
@@ -13,10 +13,10 @@
```js
// webpack.config.js
-const [ bitbagCmsShop, bitbagCmsAdmin ] = require('./vendor/bitbag/cms-plugin/webpack.config.js')
+const [ cmsShop, cmsAdmin ] = require('./vendor/bitbag/cms-plugin/webpack.config.js')
...
-module.exports = [..., bitbagCmsShop, bitbagCmsAdmin];
+module.exports = [..., cmsShop, cmsAdmin];
```
2. Add new packages in `./config/packages/assets.yaml`
@@ -29,9 +29,9 @@ framework:
packages:
# ...
cms_shop:
- json_manifest_path: '%kernel.project_dir%/public/build/bitbag/cms/shop/manifest.json'
+ json_manifest_path: '%kernel.project_dir%/public/build/cms/shop/manifest.json'
cms_admin:
- json_manifest_path: '%kernel.project_dir%/public/build/bitbag/cms/admin/manifest.json'
+ json_manifest_path: '%kernel.project_dir%/public/build/cms/admin/manifest.json'
```
3. Add new build paths in `./config/packages/webpack_encore.yml`
@@ -42,24 +42,24 @@ framework:
webpack_encore:
builds:
# ...
- cms_shop: '%kernel.project_dir%/public/build/bitbag/cms/shop'
- cms_admin: '%kernel.project_dir%/public/build/bitbag/cms/admin'
+ cms_shop: '%kernel.project_dir%/public/build/cms/shop'
+ cms_admin: '%kernel.project_dir%/public/build/cms/admin'
```
4. Add encore functions to your templates
```twig
{# @SyliusShopBundle/_scripts.html.twig #}
-{{ encore_entry_script_tags('bitbag-cms-shop', null, 'cms_shop') }}
+{{ encore_entry_script_tags('sylius-cms-shop', null, 'cms_shop') }}
{# @SyliusShopBundle/_styles.html.twig #}
-{{ encore_entry_link_tags('bitbag-cms-shop', null, 'cms_shop') }}
+{{ encore_entry_link_tags('sylius-cms-shop', null, 'cms_shop') }}
{# @SyliusAdminBundle/_scripts.html.twig #}
-{{ encore_entry_script_tags('bitbag-cms-admin', null, 'cms_admin') }}
+{{ encore_entry_script_tags('sylius-cms-admin', null, 'cms_admin') }}
{# @SyliusAdminBundle/_styles.html.twig #}
-{{ encore_entry_link_tags('bitbag-cms-admin', null, 'cms_admin') }}
+{{ encore_entry_link_tags('sylius-cms-admin', null, 'cms_admin') }}
```
5. Run `yarn encore dev` or `yarn encore production`
diff --git a/doc/01.2-webpack-entry.md b/doc/01.2-webpack-entry.md
index 1b05a90af..f9f3bac48 100644
--- a/doc/01.2-webpack-entry.md
+++ b/doc/01.2-webpack-entry.md
@@ -1,4 +1,4 @@
-# BitBag SyliusCmsPlugin
+# SyliusCmsPlugin
- [⬅️ Back](./installation.md)
@@ -14,26 +14,26 @@
// ./webpack.config.js
// Shop config
- .addEntry('bitbag-cms-shop', 'vendor/bitbag/cms-plugin/src/Resources/assets/shop/entry.js')
+ .addEntry('sylius-cms-shop', 'vendor/bitbag/cms-plugin/src/Resources/assets/shop/entry.js')
// Admin config
- .addEntry('bitbag-cms-admin', 'vendor/bitbag/cms-plugin/src/Resources/assets/admin/entry.js')
+ .addEntry('sylius-cms-admin', 'vendor/bitbag/cms-plugin/src/Resources/assets/admin/entry.js')
```
2. Add encore functions to your templates
```twig
{# @SyliusShopBundle/_scripts.html.twig #}
-{{ encore_entry_script_tags('bitbag-cms-shop', null, 'shop') }}
+{{ encore_entry_script_tags('sylius-cms-shop', null, 'shop') }}
{# @SyliusShopBundle/_styles.html.twig #}
-{{ encore_entry_link_tags('bitbag-cms-shop', null, 'shop') }}
+{{ encore_entry_link_tags('sylius-cms-shop', null, 'shop') }}
{# @SyliusAdminBundle/_scripts.html.twig #}
-{{ encore_entry_script_tags('bitbag-cms-admin', null, 'admin') }}
+{{ encore_entry_script_tags('sylius-cms-admin', null, 'admin') }}
{# @SyliusAdminBundle/_styles.html.twig #}
-{{ encore_entry_link_tags('bitbag-cms-admin', null, 'admin') }}
+{{ encore_entry_link_tags('sylius-cms-admin', null, 'admin') }}
```
3. Run `yarn encore dev` or `yarn encore production`
diff --git a/doc/01.3-import-entry.md b/doc/01.3-import-entry.md
index b9682057b..35d9b0140 100644
--- a/doc/01.3-import-entry.md
+++ b/doc/01.3-import-entry.md
@@ -1,4 +1,4 @@
-# BitBag SyliusCmsPlugin
+# SyliusCmsPlugin
- [⬅️ Back](./installation.md)
diff --git a/doc/01.4-custom-solution.md b/doc/01.4-custom-solution.md
index c8289ce29..a232831f4 100644
--- a/doc/01.4-custom-solution.md
+++ b/doc/01.4-custom-solution.md
@@ -1,4 +1,4 @@
-# BitBag SyliusCmsPlugin
+# SyliusCmsPlugin
- [⬅️ Back](./installation.md)
diff --git a/doc/01.5-non-webpack.md b/doc/01.5-non-webpack.md
index b20d41b1c..174faab67 100644
--- a/doc/01.5-non-webpack.md
+++ b/doc/01.5-non-webpack.md
@@ -1,4 +1,4 @@
-# BitBag SyliusCmsPlugin
+# SyliusCmsPlugin
- [⬅️ Back](./installation.md)
@@ -20,21 +20,21 @@ $ bin/console assets:install
```twig
{# @SyliusAdminBundle/_scripts.html.twig #}
{% include '@SyliusUi/_javascripts.html.twig' with {
- 'path': 'bundles/bitbagsyliuscmsplugin/build/bitbag-cms-admin.js'
+ 'path': 'bundles/SyliusCmsPlugin/build/sylius-cms-admin.js'
} %}
{# @SyliusAdminBundle/_styles.html.twig #}
{% include '@SyliusUi/_stylesheets.html.twig' with {
- 'path': 'bundles/bitbagsyliuscmsplugin/build/bitbag-cms-admin.css'
+ 'path': 'bundles/SyliusCmsPlugin/build/sylius-cms-admin.css'
} %}
{# @SyliusShopBundle/_scripts.html.twig #}
{% include '@SyliusUi/_javascripts.html.twig' with {
- 'path': 'bundles/bitbagsyliuscmsplugin/build/bitbag-cms-shop.js'
+ 'path': 'bundles/SyliusCmsPlugin/build/sylius-cms-shop.js'
} %}
{# @SyliusShopBundle/_styles.html.twig #}
{% include '@SyliusUi/_stylesheets.html.twig' with {
- 'path': 'bundles/bitbagsyliuscmsplugin/build/bitbag-cms-shop.css'
+ 'path': 'bundles/SyliusCmsPlugin/build/sylius-cms-shop.css'
} %}
```
diff --git a/doc/block_legacy.csv b/doc/block_legacy.csv
new file mode 100644
index 000000000..0e592d202
--- /dev/null
+++ b/doc/block_legacy.csv
@@ -0,0 +1,2 @@
+code,type,name_en_US,content_en_US,sections,channels,products,image_en_US,slug_en_US
+test4,image,Test,test,"blog, general",US_WEB,"010ba66b-adee-3d6e-9d63-67c44d686db1, 01d35db9-247d-3834-b300-20483d5e34e8",https://bitbag.shop/assets/web/images/header-logo.png,https://bitbag.shop/assets/web/images/header-logo.png
diff --git a/doc/blocks.md b/doc/blocks.md
index 7d062162a..bd421f810 100644
--- a/doc/blocks.md
+++ b/doc/blocks.md
@@ -1,11 +1,13 @@
# Blocks
-Blocks represent single parts of your Sylius web app, where you can put some content hardcoded in the
-template and change it in the future from admin panel.
+Blocks represent single parts of your Sylius web app, where you can put some content elements via the admin panel.
+Blocks can be placed on the homepage, product page, or any other page of your store.
## General usage
-In the admin panel, you can create block resources. It could be rendered in your twig templates using `bitbag_cms_render_block([block_code])` helper extension.
+### Rendering the block
+
+In the admin panel, you can create block resources. It could be rendered in your twig templates using `sylius_cms_render_block([block_code])` helper extension.
For instance, let's assume you created a block with `homepage_intro` code and want to render it on store homepage.
In your `app/Resources/views/SyliusShopBundle/Homepage/index.html.twig` file add the Twig filter like this:
@@ -14,27 +16,41 @@ In your `app/Resources/views/SyliusShopBundle/Homepage/index.html.twig` file add
{% block content %}
-# The template is not a mandatory parameter
+{{ sylius_cms_render_block('homepage_intro') }}
-{{ render(path('bitbag_sylius_cms_plugin_shop_block_render', {'code' : 'homepage_header_image', 'template' : '@App/Some/Template/_path.html.twig'})) }}
+{% endblock %}
+```
-# However, you can pass it to the `bitbag_cms_render_block` function if you wish :)
+`{{ sylius_cms_render_block([block_code]) }}` function can also take two additional parameters: `template` and `context`.
-{{ bitbag_cms_render_block('homepage_intro') }}
+`template` allows you to render a block with a custom template. For instance:
-{% endblock %}
+```twig
+{{ sylius_cms_render_block('homepage_intro', '@App/Some/Template/_path.html.twig') }}
```
-To render a block by the product code, you can use `route`.
+`context` allows you to pass additional variables to the block template. It can be one of three types:
+- `ProductInterface`
+- `TaxonInterface`
+- `array`
+
+For instance:
```twig
-{{ render(path('bitbag_sylius_cms_plugin_shop_block_index_by_product_code', {'productCode' : product.code, 'template' : '@BitBagSyliusCmsPlugin/Shop/Block/index.html.twig'})) }}
+{{ sylius_cms_render_block('homepage_intro', null, {'some_variable': 'some_value'}) }}
+{{ sylius_cms_render_block('homepage_intro', null, product) }}
+{{ sylius_cms_render_block('homepage_intro', null, taxon) }}
```
+When you pass `ProductInterface` or `TaxonInterface` as a context, the block will be rendered only if it is assigned to the given product or taxon
+in the admin panel.
+
## Customization
-If you don't know how to override templates yet,
+### Override block template
+
+If you don't know how to override templates yet,
read [Sylius template customization guide](http://docs.sylius.org/en/latest/customization/template.html).
-You can create a template under `app/Resources/BitBagSyliusCmsPlugin/views/Shop/Block` location.
+Even if you can pass template argument to render block resource, you can change the global templates under `app/templates/bundles/SyliusCmsPlugin/Shop/Block` location.
Available templates you can override can be found under [this location](../src/Resources/views/Shop/Block).
diff --git a/doc/blocks_cms.png b/doc/blocks_cms.png
index 003236f22..eccefadd5 100644
Binary files a/doc/blocks_cms.png and b/doc/blocks_cms.png differ
diff --git a/doc/blocks_cms_result.png b/doc/blocks_cms_result.png
index ecc5035aa..87c5faca6 100644
Binary files a/doc/blocks_cms_result.png and b/doc/blocks_cms_result.png differ
diff --git a/doc/blocks_create_cms.png b/doc/blocks_create_cms.png
index 4eca96ca7..e54b375a4 100644
Binary files a/doc/blocks_create_cms.png and b/doc/blocks_create_cms.png differ
diff --git a/doc/collections.md b/doc/collections.md
new file mode 100644
index 000000000..9f37fc3f3
--- /dev/null
+++ b/doc/collections.md
@@ -0,0 +1,39 @@
+# Collections
+
+Collections are a way to group multiple pages, blocks or media together.
+They are useful for organizing things in a way that makes sense to you. \
+For example, you might want to group all of your blog posts together in a collection called `Blog`.
+Or you might want to group all of your specific blocks together in a collection called `Homepage blocks`.
+
+## General usage
+
+### Rendering the collection
+
+In the admin panel, you can create collection resources.
+It could be rendered in your twig templates using `sylius_cms_render_collection([collection_code])` helper extension.
+
+`{{ sylius_cms_render_collection([collection_code]) }}` function can also take two additional parameters: `countToRender` and `template`.
+
+`countToRender` allows you to render a specific number of items from the collection. For instance:
+
+```twig
+{{ sylius_cms_render_collection('homepage_blocks', 3) }}
+```
+
+`template` allows you to render a collection with a custom template. For instance:
+
+```twig
+{{ sylius_cms_render_collection('homepage_blocks', null, '@App/Some/Template/_path.html.twig') }}
+```
+
+By default, collection items are sorted by object ID parameter. If you want to change it, you can use decorator strategy.
+You can read more about it [here](https://symfony.com/doc/current/service_container/service_decoration.html).
+
+## Customization
+
+### Override collection template
+
+If you don't know how to override templates yet, read [Sylius template customization guide](http://docs.sylius.org/en/latest/customization/template.html).
+
+Even if you can pass template argument to render collection resource, you can change the global templates under `app/templates/bundles/SyliusCmsPlugin/Shop/Collection` location.
+Available templates you can override can be found under [this location](../src/Resources/views/Shop/Collection).
diff --git a/doc/collections_cms.png b/doc/collections_cms.png
new file mode 100644
index 000000000..3dddb781f
Binary files /dev/null and b/doc/collections_cms.png differ
diff --git a/doc/collections_cms_result.png b/doc/collections_cms_result.png
new file mode 100644
index 000000000..c96ecfdb2
Binary files /dev/null and b/doc/collections_cms_result.png differ
diff --git a/doc/collections_create_cms.png b/doc/collections_create_cms.png
new file mode 100644
index 000000000..13cc513c5
Binary files /dev/null and b/doc/collections_create_cms.png differ
diff --git a/doc/content_elements.md b/doc/content_elements.md
new file mode 100644
index 000000000..8c75730af
--- /dev/null
+++ b/doc/content_elements.md
@@ -0,0 +1,128 @@
+# Content elements
+
+Content elements are used to create a page or block content that will be displayed on the store's frontend.
+
+## General usage
+
+Currently, there are 11 predefined content elements available:
+- **[Textarea](content_elements/textarea.md)** - a simple textarea with WYSIWYG editor
+- **[Single media](content_elements/single_media.md)** - a single media from the media library
+- **[Multiple media](content_elements/multiple_media.md)** - multiple media from the media library
+- **[Heading](content_elements/heading.md)** - a simple heading from h1 to h6
+- **[Products carousel](content_elements/products_carousel.md)** - a carousel with products
+- **[Products carousel by Taxon](content_elements/products_carousel_by_taxon.md)** - a carousel with products from a specific taxon
+- **[Products grid](content_elements/products_grid.md)** - a grid with products
+- **[Products grid by Taxon](content_elements/products_grid_by_taxon.md)** - a grid with products from a specific taxon
+- **[Taxons list](content_elements/taxons_list.md)** - a list of taxons
+- **[Pages collection](content_elements/pages_collection.md)** - a collection of pages
+- **[Spacer](content_elements/spacer.md)** - a simple spacer with a defined height in pixels
+
+Instead of rendering block or page, you can render just content elements in your twig templates using `sylius_cms_render_content_elements([page|block])` helper extension,
+where `page` or `block` is an instance of `Sylius\CmsPlugin\Entity\PageInterface` or `Sylius\CmsPlugin\Entity\BlockInterface`.
+
+## Customization
+
+### Templates
+
+Each of the content elements has its own template that you can override.
+
+If you don't know how to override templates yet,
+read [Sylius template customization guide](http://docs.sylius.org/en/latest/customization/template.html).
+
+You can create a template under `app/templates/bundles/SyliusCmsPlugin/Shop/ContentElement` location.
+Available templates you can override can be found under [this location](../src/Resources/views/Shop/ContentElement).
+
+### Creating a new content element
+
+If you want to create a new content element, you need to follow these steps:
+
+1. Create a new form type under `src/Form/Type/ContentElements` location. Define your fields and remember to define public const `TYPE` with a unique name.
+For example, you can create a new form type called `Text`:
+
+```php
+final class TextContentElementType extends AbstractType
+{
+ public const TYPE = 'text';
+
+ public function buildForm(FormBuilderInterface $builder, array $options): void
+ {
+ $builder
+ ->add(self::TYPE, TextType::class, [
+ 'label' => 'sylius_cms.ui.content_elements.type.' . self::TYPE,
+ ])
+ ;
+ }
+}
+```
+
+2. If your form type have constructor with some arguments, define constant parameter in `config/parameters.yaml` or yours any other `yaml` file:
+
+```yaml
+parameters:
+ sylius_cms.content_elements.type.text: !php/const 'YourNamespace\Form\Type\ContentElements\TextContentElementType::TYPE'
+```
+
+If your form type doesn't have any constructor arguments, you can skip this step, because compiler pass will automatically define it for you.
+
+
+3. If your form type have constructor with some arguments, you must define form type in service container under `config/services.yml` with correct tags:
+
+```yaml
+services:
+ sylius_cms.form.type.content_element.text:
+ class: YourNamespace\Form\Type\ContentElements\TextContentElementType
+ arguments: [...]
+ tags:
+ - { name: 'sylius_cms.content_elements.type', key: '%sylius_cms.content_elements.type.text%' }
+ - { name: 'form.type' }
+```
+
+If your form type doesn't have any constructor arguments, you can skip this step, because compiler pass will automatically register it for you.
+
+4. Create a new renderer class under `src/Renderer/ContentElement` location. Extend `Sylius\CmsPlugin\Renderer\ContentElement\AbstractContentElement` class.
+For example, you can create a new renderer called `TextContentElementRenderer`:
+
+```php
+final class TextContentElementRenderer extends AbstractContentElement
+{
+ public function supports(ContentConfigurationInterface $contentConfiguration): bool
+ {
+ return TextContentElementType::TYPE === $contentConfiguration->getType();
+ }
+
+ public function render(ContentConfigurationInterface $contentConfiguration): string
+ {
+ $text = $contentConfiguration->getConfiguration()['text'];
+
+ return $this->twig->render('@SyliusCmsPlugin/Shop/ContentElement/index.html.twig', [
+ 'content_element' => $this->template,
+ 'text' => $text,
+ ]);
+ }
+}
+```
+
+5. Register your renderer with tag in service container under `config/services.yml`:
+
+```yaml
+services:
+ sylius_cms.renderer.content_element.text:
+ class: YourNamespace\Renderer\ContentElement\TextContentElementRenderer
+ arguments:
+ - '@twig'
+ tags:
+ - {
+ name: 'sylius_cms.renderer.content_element',
+ template: '@YourNamespace/Shop/ContentElement/_text.html.twig',
+ form_type: 'YourNamespace\Form\Type\ContentElements\TextContentElementType'
+ }
+```
+
+Define form_type only if your form type doesn't have constructor with additional arguments.
+
+6. Finally, create a new template under `templates/bundles/SyliusCmsPlugin/Shop/ContentElement` location.
+For example, you can create a new template called `_text.html.twig`:
+
+```twig
+Hello World
')->willReturn('Hello World
'); - $this->render($block)->shouldReturn($expectedParsedContent); + $this->render($page)->shouldReturn('Hello World
'); } - public function it_renders_content_elements_using_registered_renderers_for_page( + public function it_skips_content_element_with_non_matching_locale( + BlockInterface $block, + ContentConfigurationInterface $contentElement, + LocaleContextInterface $localeContext, ContentParserInterface $contentParser, - ContentElementRendererInterface $renderer1, - ContentElementRendererInterface $renderer2, - PageInterface $page, - ContentConfigurationInterface $contentElement1, - ContentConfigurationInterface $contentElement2 - ): void - { - $page->getContentElements()->willReturn( - new ArrayCollection([$contentElement1->getWrappedObject(), $contentElement2->getWrappedObject()]) - ); + ): void { + $block->getContentElements()->willReturn(new ArrayCollection([$contentElement])); + $localeContext->getLocaleCode()->willReturn('en_US'); + $contentElement->getLocale()->willReturn('fr_FR'); + + $contentParser->parse('')->willReturn(''); - $renderer1->supports($contentElement1)->willReturn(true); - $renderer1->supports($contentElement2)->willReturn(false); - $renderer1->render($contentElement1)->willReturn('Rendered content 1'); - $renderer2->supports($contentElement2)->willReturn(true); - $renderer2->supports($contentElement1)->willReturn(false); - $renderer2->render($contentElement2)->willReturn('Rendered content 2'); + $this->render($block)->shouldReturn(''); + } + + public function it_renders_only_supported_content_elements( + BlockInterface $block, + ContentConfigurationInterface $supportedElement, + ContentConfigurationInterface $unsupportedElement, + LocaleContextInterface $localeContext, + ContentElementRendererInterface $renderer, + ContentParserInterface $contentParser, + ): void { + $block->getContentElements()->willReturn(new ArrayCollection([$supportedElement->getWrappedObject(), $unsupportedElement->getWrappedObject()])); + $localeContext->getLocaleCode()->willReturn('en_US'); + $supportedElement->getLocale()->willReturn('en_US'); + $unsupportedElement->getLocale()->willReturn('en_US'); - $expectedParsedContent = 'Parsed content after rendering'; + $renderer->supports($supportedElement)->willReturn(true); + $renderer->render($supportedElement)->willReturn('<p>Supported</p>'); + $renderer->supports($unsupportedElement)->willReturn(false); - $contentParser->parse('Rendered content 1Rendered content 2')->willReturn($expectedParsedContent); + $contentParser->parse('Supported
')->willReturn('Supported
'); - $this->render($page)->shouldReturn($expectedParsedContent); + $this->render($block)->shouldReturn('Supported
'); } } diff --git a/spec/Renderer/PageLinkRendererSpec.php b/spec/Renderer/PageLinkRendererSpec.php index 45fb7b5f9..f7d3debf6 100644 --- a/spec/Renderer/PageLinkRendererSpec.php +++ b/spec/Renderer/PageLinkRendererSpec.php @@ -1,19 +1,13 @@ beConstructedWith($urlGenerator, $twig); } @@ -39,23 +33,23 @@ public function it_implements_page_link_renderer_interface(): void public function it_renders_page_link_with_default_template( UrlGeneratorInterface $urlGenerator, Environment $twig, - PageInterface $page + PageInterface $page, ): void { $page->getSlug()->willReturn('page-slug'); $page->getName()->willReturn('Page Name'); $urlGenerator->generate( - 'bitbag_sylius_cms_plugin_shop_page_show', + 'sylius_cms_shop_page_show', ['slug' => 'page-slug'], - UrlGeneratorInterface::ABSOLUTE_URL + UrlGeneratorInterface::ABSOLUTE_URL, )->willReturn('http://example.com/page-slug'); $twig->render( - '@BitBagSyliusCmsPlugin/Shop/Page/link.html.twig', + '@SyliusCmsPlugin/Shop/Page/link.html.twig', [ 'link' => 'http://example.com/page-slug', 'name' => 'Page Name', - ] + ], )->willReturn('Page Name'); $this->render($page)->shouldReturn('Page Name'); @@ -64,15 +58,15 @@ public function it_renders_page_link_with_default_template( public function it_renders_page_link_with_custom_template( UrlGeneratorInterface $urlGenerator, Environment $twig, - PageInterface $page + PageInterface $page, ): void { $page->getSlug()->willReturn('page-slug'); $page->getName()->willReturn('Page Name'); $urlGenerator->generate( - 'bitbag_sylius_cms_plugin_shop_page_show', + 'sylius_cms_shop_page_show', ['slug' => 'page-slug'], - UrlGeneratorInterface::ABSOLUTE_URL + UrlGeneratorInterface::ABSOLUTE_URL, )->willReturn('http://example.com/page-slug'); $twig->render( @@ -80,7 +74,7 @@ public function it_renders_page_link_with_custom_template( [ 'link' => 'http://example.com/page-slug', 'name' => 'Page Name', - ] + ], )->willReturn('Page Name'); $this->render($page, 'custom_template.html.twig')->shouldReturn('Page Name'); diff --git a/spec/Resolver/BlockResourceResolverSpec.php b/spec/Resolver/BlockResourceResolverSpec.php index 55931e0a6..b87eb2060 100755 --- a/spec/Resolver/BlockResourceResolverSpec.php +++ b/spec/Resolver/BlockResourceResolverSpec.php @@ -1,26 +1,18 @@ shouldHaveType(BlockResourceResolverInterface::class); } - public function it_logs_warning_if_block_was_not_found( - BlockRepositoryInterface $blockRepository, - LoggerInterface $logger, - ChannelContextInterface $channelContext, - ChannelInterface $channel - ) { - $channel->getCode()->willReturn('WEB'); - $channelContext->getChannel()->willReturn($channel); - $blockRepository->findEnabledByCode('homepage_banner', 'WEB')->willReturn(null); - - $logger - ->warning(sprintf( - 'Block with "%s" code was not found in the database.', - 'homepage_banner' - )) - ->shouldBeCalled() - ; - - $this->findOrLog('homepage_banner'); - } - - public function it_logs_warning_if_block_was_found_but_it_does_not_have_locale( - BlockRepositoryInterface $blockRepository, - LoggerInterface $logger, - ChannelContextInterface $channelContext, - ChannelInterface $channel, - LocaleContextInterface $localeContext, - LocaleInterface $locale, - RepositoryInterface $localeRepository, - BlockInterface $block - ) { - $channel->getCode()->willReturn('WEB'); - $channelContext->getChannel()->willReturn($channel); - $blockRepository->findEnabledByCode('homepage_banner', 'WEB')->willReturn($block); - $localeContext->getLocaleCode()->willReturn('en_US'); - $locale->getCode()->willReturn('en_US'); - $localeRepository->findOneBy(['code' => 'en_US'])->willReturn($locale); - $block->hasLocale($locale)->willReturn(false); - $block->getLocales()->willReturn(new ArrayCollection(['pl_PL'])); - - $logger - ->warning(sprintf( - 'Block with "%s" code was found in the database, but it does not have "%s" locale.', - 'homepage_banner', - 'en_US' - )) - ->shouldBeCalled() - ; - - $this->findOrLog('homepage_banner'); - } - public function it_returns_block_if_found_in_database( BlockRepositoryInterface $blockRepository, BlockInterface $block, ChannelContextInterface $channelContext, ChannelInterface $channel, - LocaleContextInterface $localeContext, - LocaleInterface $locale, - RepositoryInterface $localeRepository, ) { $channel->getCode()->willReturn('WEB'); $channelContext->getChannel()->willReturn($channel); $blockRepository->findEnabledByCode('homepage_banner', 'WEB')->willReturn($block); - $localeContext->getLocaleCode()->willReturn('en_US'); - $locale->getCode()->willReturn('en_US'); - $localeRepository->findOneBy(['code' => 'en_US'])->willReturn($locale); - $block->hasLocale($locale)->willReturn(true); $this->findOrLog('homepage_banner')->shouldReturn($block); } diff --git a/spec/Resolver/ImporterChannelsResolverSpec.php b/spec/Resolver/Importer/ImporterChannelsResolverSpec.php similarity index 67% rename from spec/Resolver/ImporterChannelsResolverSpec.php rename to spec/Resolver/Importer/ImporterChannelsResolverSpec.php index c4ac903af..38cd5d130 100644 --- a/spec/Resolver/ImporterChannelsResolverSpec.php +++ b/spec/Resolver/Importer/ImporterChannelsResolverSpec.php @@ -1,19 +1,13 @@ assign($collectionable, Argument::any())->shouldNotBeCalled(); diff --git a/spec/Resolver/ImporterLocalesResolverSpec.php b/spec/Resolver/Importer/ImporterLocalesResolverSpec.php similarity index 60% rename from spec/Resolver/ImporterLocalesResolverSpec.php rename to spec/Resolver/Importer/ImporterLocalesResolverSpec.php index ed4b4e619..83d2ca4c7 100644 --- a/spec/Resolver/ImporterLocalesResolverSpec.php +++ b/spec/Resolver/Importer/ImporterLocalesResolverSpec.php @@ -1,19 +1,13 @@ assign($localesAware, ['en_US', 'fr_FR'])->shouldBeCalled(); @@ -39,7 +33,7 @@ public function it_resolves_locales_for_locale_aware_entity( public function it_does_not_assign_locales_when_locales_row_is_empty( LocalesAssignerInterface $localesAssigner, - LocaleAwareInterface $localesAware + LocaleAwareInterface $localesAware, ) { $localesAssigner->assign($localesAware, [])->shouldNotBeCalled(); diff --git a/spec/Resolver/ImporterProductsInTaxonsResolverSpec.php b/spec/Resolver/Importer/ImporterProductsInTaxonsResolverSpec.php similarity index 62% rename from spec/Resolver/ImporterProductsInTaxonsResolverSpec.php rename to spec/Resolver/Importer/ImporterProductsInTaxonsResolverSpec.php index c1ce51ab4..77fd7b8d5 100644 --- a/spec/Resolver/ImporterProductsInTaxonsResolverSpec.php +++ b/spec/Resolver/Importer/ImporterProductsInTaxonsResolverSpec.php @@ -1,19 +1,13 @@ assign($productsInTaxonsAware, ['taxon_code_1', 'taxon_code_2'])->shouldBeCalled(); @@ -39,7 +33,7 @@ public function it_resolves_taxons_for_products_in_taxons_aware_entity( public function it_does_not_assign_taxons_when_taxons_row_is_null( ProductsInTaxonsAssignerInterface $productsInTaxonsAssigner, - ProductsInTaxonsAwareInterface $productsInTaxonsAware + ProductsInTaxonsAwareInterface $productsInTaxonsAware, ) { $productsInTaxonsAssigner->assign($productsInTaxonsAware, [])->shouldNotBeCalled(); diff --git a/spec/Resolver/ImporterProductsResolverSpec.php b/spec/Resolver/Importer/ImporterProductsResolverSpec.php similarity index 63% rename from spec/Resolver/ImporterProductsResolverSpec.php rename to spec/Resolver/Importer/ImporterProductsResolverSpec.php index 3b3bd5b96..5649e82f2 100644 --- a/spec/Resolver/ImporterProductsResolverSpec.php +++ b/spec/Resolver/Importer/ImporterProductsResolverSpec.php @@ -1,20 +1,14 @@ assign($taxonsAware, ['taxon_code_1', 'taxon_code_2'])->shouldBeCalled(); @@ -39,7 +33,7 @@ public function it_resolves_taxons_for_taxon_aware_entity( public function it_does_not_assign_taxons_when_taxons_row_is_null( TaxonsAssignerInterface $taxonsAssigner, - TaxonAwareInterface $taxonsAware + TaxonAwareInterface $taxonsAware, ) { $taxonsAssigner->assign($taxonsAware, [])->shouldNotBeCalled(); diff --git a/spec/Resolver/MediaProviderResolverSpec.php b/spec/Resolver/MediaProviderResolverSpec.php index 5010793c9..d57e7b57e 100644 --- a/spec/Resolver/MediaProviderResolverSpec.php +++ b/spec/Resolver/MediaProviderResolverSpec.php @@ -1,20 +1,14 @@ getType()->willReturn($mediaType); @@ -45,7 +39,7 @@ public function it_resolves_provider_for_media( } public function it_throws_exception_when_media_type_is_null( - MediaInterface $media + MediaInterface $media, ) { $media->getType()->willReturn(null); diff --git a/spec/Resolver/MediaResourceResolverSpec.php b/spec/Resolver/MediaResourceResolverSpec.php index aa1d4a3c2..fc744b63b 100644 --- a/spec/Resolver/MediaResourceResolverSpec.php +++ b/spec/Resolver/MediaResourceResolverSpec.php @@ -1,24 +1,17 @@ beConstructedWith($mediaRepository, $channelContext, $logger); } @@ -45,7 +38,7 @@ public function it_returns_media_when_found( ChannelContextInterface $channelContext, MediaInterface $media, ChannelInterface $channel, - ) { + ) { $code = 'media_code'; $channelCode = 'ecommerce'; @@ -62,7 +55,7 @@ public function it_logs_warning_and_returns_null_when_media_not_found( ChannelContextInterface $channelContext, LoggerInterface $logger, ChannelInterface $channel, - ) { + ) { $code = 'non_existing_code'; $channelCode = 'ecommerce'; diff --git a/spec/Resolver/PageResourceResolverSpec.php b/spec/Resolver/PageResourceResolverSpec.php index 8911c70c4..61f7920c0 100755 --- a/spec/Resolver/PageResourceResolverSpec.php +++ b/spec/Resolver/PageResourceResolverSpec.php @@ -1,28 +1,21 @@ beConstructedWith($pageRepository, $logger); } @@ -39,14 +32,14 @@ public function it_implements_page_resource_resolver_interface(): void public function it_logs_warning_if_page_was_not_found( PageRepositoryInterface $pageRepository, - LoggerInterface $logger + LoggerInterface $logger, ) { $pageRepository->findOneEnabledByCode('homepage_banner')->willReturn(null); $logger ->warning(sprintf( 'Page with "%s" code was not found in the database.', - 'homepage_banner' + 'homepage_banner', )) ->shouldBeCalled() ; @@ -56,7 +49,7 @@ public function it_logs_warning_if_page_was_not_found( public function it_returns_page_if_found_in_database( PageRepositoryInterface $pageRepository, - PageInterface $page + PageInterface $page, ) { $pageRepository->findOneEnabledByCode('homepage_banner')->willReturn($page); diff --git a/spec/Resolver/ResourceResolverSpec.php b/spec/Resolver/ResourceResolverSpec.php index 74817d9bf..9ce6bea2b 100644 --- a/spec/Resolver/ResourceResolverSpec.php +++ b/spec/Resolver/ResourceResolverSpec.php @@ -1,17 +1,11 @@ beConstructedWith($repository, $factory, 'unique_column'); } @@ -32,7 +26,7 @@ public function it_is_initializable() public function it_returns_existing_resource_from_repository( RepositoryInterface $repository, - ResourceInterface $resource + ResourceInterface $resource, ) { $identifier = 'resource_identifier'; @@ -44,7 +38,7 @@ public function it_returns_existing_resource_from_repository( public function it_creates_new_resource_using_factory( RepositoryInterface $repository, FactoryInterface $factory, - ResourceInterface $newResource + ResourceInterface $newResource, ) { $identifier = 'resource_identifier'; $factoryMethod = 'createNew'; @@ -57,7 +51,7 @@ public function it_creates_new_resource_using_factory( public function it_throws_exception_when_factory_method_not_callable( RepositoryInterface $repository, - FactoryInterface $factory + FactoryInterface $factory, ) { $identifier = 'resource_identifier'; $factoryMethod = 'nonExistingMethod'; diff --git a/spec/Sorter/CollectionsSorterSpec.php b/spec/Sorter/CollectionsSorterSpec.php index 2b0116db2..6a296c90a 100644 --- a/spec/Sorter/CollectionsSorterSpec.php +++ b/spec/Sorter/CollectionsSorterSpec.php @@ -1,23 +1,15 @@ getCode()->willReturn('COLLECTION_CODE'); $page->getCollections()->willReturn(new ArrayCollection([$collection->getWrappedObject()])); @@ -41,28 +33,28 @@ public function it_sorts_collections_with_one_element( $this->sortByCollections([$page])->shouldReturn( [ 'COLLECTION_CODE' => ['collection' => $collection, 0 => $page], - ] + ], ); } public function it_sorts_collections_with_more_elements( - PageInterface $page1, - PageInterface $page2, - PageInterface $page3, + PageInterface $page1, + PageInterface $page2, + PageInterface $page3, CollectionInterface $collection1, CollectionInterface $collection2, - CollectionInterface $collection3 + CollectionInterface $collection3, ): void { $collection1->getCode()->willReturn('COLLECTION_1_CODE'); $collection2->getCode()->willReturn('COLLECTION_2_CODE'); $collection3->getCode()->willReturn('COLLECTION_3_CODE'); $page1->getCollections()->willReturn(new ArrayCollection( - [$collection1->getWrappedObject(), $collection3->getWrappedObject()] + [$collection1->getWrappedObject(), $collection3->getWrappedObject()], )); $page2->getCollections()->willReturn(new ArrayCollection([$collection3->getWrappedObject()])); $page3->getCollections()->willReturn(new ArrayCollection( - [$collection2->getWrappedObject(), $collection1->getWrappedObject()] + [$collection2->getWrappedObject(), $collection1->getWrappedObject()], )); $this->sortByCollections([$page1, $page2, $page3])->shouldReturn( @@ -70,15 +62,15 @@ public function it_sorts_collections_with_more_elements( 'COLLECTION_1_CODE' => ['collection' => $collection1, 0 => $page1, 1 => $page3], 'COLLECTION_3_CODE' => ['collection' => $collection3, 0 => $page1, 1 => $page2], 'COLLECTION_2_CODE' => ['collection' => $collection2, 0 => $page3], - ] + ], ); } public function it_sorts_collections_with_less_elements( - PageInterface $page1, - PageInterface $page2, + PageInterface $page1, + PageInterface $page2, CollectionInterface $collection1, - CollectionInterface $collection2 + CollectionInterface $collection2, ): void { $collection1->getCode()->willReturn('COLLECTION_1_CODE'); $collection2->getCode()->willReturn('COLLECTION_2_CODE'); @@ -90,7 +82,7 @@ public function it_sorts_collections_with_less_elements( [ 'COLLECTION_1_CODE' => ['collection' => $collection1, 0 => $page1], 'COLLECTION_2_CODE' => ['collection' => $collection2, 0 => $page2], - ] + ], ); } } diff --git a/spec/Twig/Parser/ContentParserSpec.php b/spec/Twig/Parser/ContentParserSpec.php index 96e4fcdd9..665680212 100644 --- a/spec/Twig/Parser/ContentParserSpec.php +++ b/spec/Twig/Parser/ContentParserSpec.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace spec\BitBag\SyliusCmsPlugin\Twig\Parser; +namespace spec\Sylius\CmsPlugin\Twig\Parser; -use BitBag\SyliusCmsPlugin\Twig\Parser\ContentParser; -use BitBag\SyliusCmsPlugin\Twig\Parser\ContentParserInterface; -use BitBag\SyliusCmsPlugin\Twig\Runtime\RenderBlockRuntimeInterface; use PhpSpec\ObjectBehavior; +use Sylius\CmsPlugin\Twig\Parser\ContentParser; +use Sylius\CmsPlugin\Twig\Parser\ContentParserInterface; +use Sylius\CmsPlugin\Twig\Runtime\RenderBlockRuntimeInterface; use Twig\Environment; use Twig\TwigFunction; @@ -15,7 +15,7 @@ final class ContentParserSpec extends ObjectBehavior { public function let(Environment $twigEnvironment): void { - $this->beConstructedWith($twigEnvironment, ['bitbag_cms_render_block']); + $this->beConstructedWith($twigEnvironment, ['sylius_cms_render_block']); } public function it_is_initializable(): void @@ -30,35 +30,34 @@ public function it_implements_content_parser_interface(): void public function it_parses_string_function( Environment $twigEnvironment, - RenderBlockRuntimeInterface $renderBlockRuntime + RenderBlockRuntimeInterface $renderBlockRuntime, ): void { - $twigFunctionName = 'bitbag_cms_render_block'; + $twigFunctionName = 'sylius_cms_render_block'; $twigEnvironment->getFunctions()->willReturn([ - $twigFunctionName => new TwigFunction($twigFunctionName, [$renderBlockRuntime->getWrappedObject(), 'renderBlock']) + $twigFunctionName => new TwigFunction($twigFunctionName, [$renderBlockRuntime->getWrappedObject(), 'renderBlock']), ]); - $input = "Let's render! {{ bitbag_cms_render_block('intro', '@BitBagSyliusCmsPlugin/Shop/Block/show.html.twig') }}"; + $input = "Let's render! {{ sylius_cms_render_block('intro', '@SyliusCmsPlugin/Shop/Block/show.html.twig') }}"; - $renderBlockRuntime->renderBlock('intro', '@BitBagSyliusCmsPlugin/Shop/Block/show.html.twig')->shouldBeCalled(); + $renderBlockRuntime->renderBlock('intro', '@SyliusCmsPlugin/Shop/Block/show.html.twig')->shouldBeCalled(); $this->parse($input); } public function it_parses_string_functions( Environment $twigEnvironment, - RenderBlockRuntimeInterface $renderBlockRuntime + RenderBlockRuntimeInterface $renderBlockRuntime, ): void { - - $twigFunctionName = 'bitbag_cms_render_block'; + $twigFunctionName = 'sylius_cms_render_block'; $twigEnvironment->getFunctions()->willReturn([ - $twigFunctionName => new TwigFunction($twigFunctionName, [$renderBlockRuntime->getWrappedObject(), 'renderBlock']) + $twigFunctionName => new TwigFunction($twigFunctionName, [$renderBlockRuntime->getWrappedObject(), 'renderBlock']), ]); - $input = "Let's render! {{ bitbag_cms_render_block('intro', '@BitBagSyliusCmsPlugin/Shop/Block/show.html.twig') }} - Let's render twice! {{ bitbag_cms_render_block('intro1', '@BitBagSyliusCmsPlugin/Shop/Block/show.html.twig') }}"; + $input = "Let's render! {{ sylius_cms_render_block('intro', '@SyliusCmsPlugin/Shop/Block/show.html.twig') }} + Let's render twice! {{ sylius_cms_render_block('intro1', '@SyliusCmsPlugin/Shop/Block/show.html.twig') }}"; - $renderBlockRuntime->renderBlock('intro', '@BitBagSyliusCmsPlugin/Shop/Block/show.html.twig')->shouldBeCalled(); - $renderBlockRuntime->renderBlock('intro1', '@BitBagSyliusCmsPlugin/Shop/Block/show.html.twig')->shouldBeCalled(); + $renderBlockRuntime->renderBlock('intro', '@SyliusCmsPlugin/Shop/Block/show.html.twig')->shouldBeCalled(); + $renderBlockRuntime->renderBlock('intro1', '@SyliusCmsPlugin/Shop/Block/show.html.twig')->shouldBeCalled(); $this->parse($input); } diff --git a/spec/Twig/Runtime/RenderBlockRuntimeSpec.php b/spec/Twig/Runtime/RenderBlockRuntimeSpec.php index 69c782e97..f59b06686 100644 --- a/spec/Twig/Runtime/RenderBlockRuntimeSpec.php +++ b/spec/Twig/Runtime/RenderBlockRuntimeSpec.php @@ -1,23 +1,15 @@ beConstructedWith($blockResourceResolver, $templatingEngine, $contentElementRendererStrategy); } @@ -52,7 +44,7 @@ public function it_returns_empty_string_when_block_not_found(BlockResourceResolv public function it_returns_empty_string_when_block_not_displayable_for_taxon( BlockResourceResolverInterface $blockResourceResolver, BlockInterface $block, - TaxonInterface $taxon + TaxonInterface $taxon, ): void { $blockResourceResolver->findOrLog('code')->willReturn($block); $block->canBeDisplayedForTaxon($taxon)->willReturn(false); @@ -63,7 +55,7 @@ public function it_returns_empty_string_when_block_not_displayable_for_taxon( public function it_returns_empty_string_when_block_not_displayable_for_product( BlockResourceResolverInterface $blockResourceResolver, BlockInterface $block, - ProductInterface $product + ProductInterface $product, ): void { $blockResourceResolver->findOrLog('code')->willReturn($block); $block->canBeDisplayedForProduct($product)->willReturn(false); @@ -76,12 +68,12 @@ public function it_renders_block_with_default_template( BlockResourceResolverInterface $blockResourceResolver, Environment $templatingEngine, ContentElementRendererStrategyInterface $contentElementRendererStrategy, - BlockInterface $block + BlockInterface $block, ): void { $blockResourceResolver->findOrLog('code')->willReturn($block); $contentElementRendererStrategy->render($block)->willReturn('rendered content'); - $templatingEngine->render('@BitBagSyliusCmsPlugin/Shop/Block/show.html.twig', [ + $templatingEngine->render('@SyliusCmsPlugin/Shop/Block/show.html.twig', [ 'content' => 'rendered content', 'context' => null, ])->willReturn('rendered block'); @@ -93,7 +85,7 @@ public function it_renders_block_with_custom_template( BlockResourceResolverInterface $blockResourceResolver, Environment $templatingEngine, ContentElementRendererStrategyInterface $contentElementRendererStrategy, - BlockInterface $block + BlockInterface $block, ): void { $blockResourceResolver->findOrLog('code')->willReturn($block); $contentElementRendererStrategy->render($block)->willReturn('rendered content'); diff --git a/spec/Twig/Runtime/RenderContentElementsRuntimeSpec.php b/spec/Twig/Runtime/RenderContentElementsRuntimeSpec.php index 483bb47cb..c5c3eea89 100644 --- a/spec/Twig/Runtime/RenderContentElementsRuntimeSpec.php +++ b/spec/Twig/Runtime/RenderContentElementsRuntimeSpec.php @@ -1,22 +1,14 @@ beConstructedWith($contentParser); } @@ -38,7 +30,7 @@ public function it_implements_render_content_runtime_interface(): void public function it_renders_content( ContentParserInterface $contentParser, - ContentableInterface $contentableResource + ContentableInterface $contentableResource, ): void { $contentParser->parse('content')->willReturn('content'); $contentableResource->getContent()->willReturn('content'); diff --git a/spec/Twig/Runtime/RenderMediaRuntimeSpec.php b/spec/Twig/Runtime/RenderMediaRuntimeSpec.php index f699e23e1..c5ec67b9d 100644 --- a/spec/Twig/Runtime/RenderMediaRuntimeSpec.php +++ b/spec/Twig/Runtime/RenderMediaRuntimeSpec.php @@ -1,30 +1,22 @@ beConstructedWith($mediaProviderResolver, $mediaResourceResolver); } @@ -43,12 +35,12 @@ public function it_renders_media( MediaResourceResolverInterface $mediaResourceResolver, MediaProviderResolverInterface $mediaProviderResolver, ProviderInterface $provider, - MediaInterface $media + MediaInterface $media, ): void { - $mediaResourceResolver->findOrLog('bitbag')->willReturn($media); + $mediaResourceResolver->findOrLog('sylius_cms')->willReturn($media); $provider->render($media, null)->willReturn('content'); $mediaProviderResolver->resolveProvider($media)->willReturn($provider); - $this->renderMedia('bitbag')->shouldReturn('content'); + $this->renderMedia('sylius_cms')->shouldReturn('content'); } } diff --git a/spec/Twig/Runtime/RenderPageLinkRuntimeSpec.php b/spec/Twig/Runtime/RenderPageLinkRuntimeSpec.php index 39fce9a8c..c2240ca7a 100644 --- a/spec/Twig/Runtime/RenderPageLinkRuntimeSpec.php +++ b/spec/Twig/Runtime/RenderPageLinkRuntimeSpec.php @@ -1,22 +1,14 @@ beConstructedWith($pageRepository, $router, 'defaultTemplate'); } @@ -63,7 +55,7 @@ public function it_renders_link_for_code( public function it_gets_link_for_code( RouterInterface $router, PageRepositoryInterface $pageRepository, - PageInterface $page + PageInterface $page, ): void { $code = 'CODE'; $slug = 'SLUG'; @@ -72,13 +64,13 @@ public function it_gets_link_for_code( $pageRepository->findOneEnabledByCode($code)->willReturn($page); $page->getSlug()->willReturn($slug); - $router->generate('bitbag_sylius_cms_plugin_shop_page_show', ['slug' => $slug])->willReturn('link'); + $router->generate('sylius_cms_shop_page_show', ['slug' => $slug])->willReturn('link'); $this->getLinkForCode($code, $options)->shouldReturn('link'); } public function it_returns_not_found_message_when_getting_link_for_code( - LocaleContextInterface $localeContext + LocaleContextInterface $localeContext, ): void { $localeContext->getLocaleCode()->willReturn('en_US'); diff --git a/spec/Twig/Runtime/TranslationFormReduceRuntimeSpec.php b/spec/Twig/Runtime/TranslationFormReduceRuntimeSpec.php new file mode 100644 index 000000000..80822f696 --- /dev/null +++ b/spec/Twig/Runtime/TranslationFormReduceRuntimeSpec.php @@ -0,0 +1,125 @@ +shouldHaveType(TranslationFormReduceRuntime::class); + } + + public function it_reduces_form_to_specified_fields( + FormView $form, + FormView $localeForm, + FormView $slugForm, + FormView $titleForm, + ): void { + $form->children = [ + 'en_US' => $localeForm, + ]; + + $localeForm->children = [ + 'slug' => $slugForm, + 'title' => $titleForm, + 'metaDescription' => new FormView(), + ]; + + $result = $this->reduceTranslationForm($form, ['slug', 'title']); + $result->shouldHaveKey('en_US'); + $result['en_US']->shouldHaveKey('slug'); + $result['en_US']->shouldHaveKey('title'); + $result['en_US']->shouldNotHaveKey('metaDescription'); + } + + public function it_throws_exception_if_field_is_not_found(FormView $form, FormView $localeForm): void + { + $form->children = [ + 'en_US' => $localeForm, + ]; + + $localeForm->children = [ + 'metaDescription' => new FormView(), + ]; + + $this->shouldThrow(\InvalidArgumentException::class)->during('reduceTranslationForm', [$form, ['slug', 'title']]); + } + + public function it_handles_multiple_locales( + FormView $form, + FormView $enLocale, + FormView $deLocale, + FormView $slugForm, + FormView $titleForm, + ): void { + $form->children = [ + 'en_US' => $enLocale, + 'de_DE' => $deLocale, + ]; + + $enLocale->children = [ + 'slug' => $slugForm, + 'title' => $titleForm, + ]; + + $deLocale->children = [ + 'slug' => $slugForm, + 'title' => $titleForm, + ]; + + $result = $this->reduceTranslationForm($form, ['slug', 'title']); + $result->shouldHaveCount(2); + $result['en_US']->shouldHaveKey('slug'); + $result['en_US']->shouldHaveKey('title'); + $result['de_DE']->shouldHaveKey('slug'); + $result['de_DE']->shouldHaveKey('title'); + } + + public function it_throws_exception_if_field_is_not_present_in_multiple_locales( + FormView $form, + FormView $enLocale, + FormView $deLocale, + FormView $slugForm, + ): void { + $form->children = [ + 'en_US' => $enLocale, + 'de_DE' => $deLocale, + ]; + + $enLocale->children = [ + 'slug' => $slugForm, + ]; + + $deLocale->children = [ + 'slug' => $slugForm, + // 'title' is missing in de_DE + ]; + + $this->shouldThrow(\InvalidArgumentException::class)->during('reduceTranslationForm', [$form, ['slug', 'title']]); + } + + public function it_handles_empty_field_array( + FormView $form, + FormView $localeForm, + FormView $slugForm, + FormView $titleForm, + ): void { + $form->children = [ + 'en_US' => $localeForm, + ]; + + $localeForm->children = [ + 'slug' => $slugForm, + 'title' => $titleForm, + ]; + + $result = $this->reduceTranslationForm($form, []); + $result->shouldHaveCount(0); + } +} diff --git a/src/Assigner/ChannelsAssigner.php b/src/Assigner/ChannelsAssigner.php index ababfc15b..c911fca89 100644 --- a/src/Assigner/ChannelsAssigner.php +++ b/src/Assigner/ChannelsAssigner.php @@ -1,14 +1,8 @@ channelRepository->findOneBy(['code' => $channelCode]); + $channels = $this->channelRepository->findBy(['code' => $channelsCodes]); + Assert::allIsInstanceOf($channels, ChannelInterface::class); - Assert::notNull($channel, sprintf('Channel with %s code not found.', $channelCode)); + foreach ($channels as $channel) { $channelsAware->addChannel($channel); } } diff --git a/src/Assigner/ChannelsAssignerInterface.php b/src/Assigner/ChannelsAssignerInterface.php index 4bc3c7731..d44118350 100644 --- a/src/Assigner/ChannelsAssignerInterface.php +++ b/src/Assigner/ChannelsAssignerInterface.php @@ -1,14 +1,8 @@ collectionRepository->findOneBy(['code' => $collectionCode]); + $collections = $this->collectionRepository->findBy(['code' => $collectionsCodes]); + Assert::allIsInstanceOf($collections, CollectionInterface::class); - Assert::notNull($collection, sprintf('Collection with %s code not found.', $collectionCode)); + foreach ($collections as $collection) { $collectionsAware->addCollection($collection); } } diff --git a/src/Assigner/CollectionsAssignerInterface.php b/src/Assigner/CollectionsAssignerInterface.php index 7ad276981..a48e7af97 100644 --- a/src/Assigner/CollectionsAssignerInterface.php +++ b/src/Assigner/CollectionsAssignerInterface.php @@ -1,16 +1,10 @@ localeRepository->findAll(); + $locales = $this->localeRepository->findBy(['code' => $localesCodes]); + Assert::allIsInstanceOf($locales, LocaleInterface::class); - /** @var LocaleInterface $locale */ foreach ($locales as $locale) { - if (in_array($locale->getCode(), $localesCodes, true)) { - $localesAware->addLocale($locale); - } + $localesAware->addLocale($locale); } } } diff --git a/src/Assigner/LocalesAssignerInterface.php b/src/Assigner/LocalesAssignerInterface.php index a189e7776..5d5a3645e 100644 --- a/src/Assigner/LocalesAssignerInterface.php +++ b/src/Assigner/LocalesAssignerInterface.php @@ -1,16 +1,10 @@ productRepository->findOneBy(['code' => $productCode]); + $products = $this->productRepository->findBy(['code' => $productsCodes]); + Assert::allIsInstanceOf($products, ProductInterface::class); - Assert::notNull($product, sprintf('Product with %s code not found.', $productCode)); + foreach ($products as $product) { $productsAware->addProduct($product); } } diff --git a/src/Assigner/ProductsAssignerInterface.php b/src/Assigner/ProductsAssignerInterface.php index b3fb31b89..333cd6383 100644 --- a/src/Assigner/ProductsAssignerInterface.php +++ b/src/Assigner/ProductsAssignerInterface.php @@ -1,16 +1,10 @@ taxonRepository->findOneBy(['code' => $taxonCode]); + $taxons = $this->taxonRepository->findBy(['code' => $taxonCodes]); + Assert::allIsInstanceOf($taxons, TaxonInterface::class); - Assert::notNull($taxon, sprintf('Taxon with %s code not found.', $taxonCode)); + foreach ($taxons as $taxon) { $productsInTaxonsAware->addProductsInTaxon($taxon); } } diff --git a/src/Assigner/ProductsInTaxonsAssignerInterface.php b/src/Assigner/ProductsInTaxonsAssignerInterface.php index 569fc3833..4bf692b76 100644 --- a/src/Assigner/ProductsInTaxonsAssignerInterface.php +++ b/src/Assigner/ProductsInTaxonsAssignerInterface.php @@ -1,16 +1,10 @@ taxonRepository->findOneBy(['code' => $taxonCode]); + $taxons = $this->taxonRepository->findBy(['code' => $taxonCodes]); + Assert::allIsInstanceOf($taxons, TaxonInterface::class); - Assert::notNull($taxon, sprintf('Taxon with %s code not found.', $taxonCode)); + foreach ($taxons as $taxon) { $taxonAware->addTaxon($taxon); } } diff --git a/src/Assigner/TaxonsAssignerInterface.php b/src/Assigner/TaxonsAssignerInterface.php index 3a903587a..736082580 100644 --- a/src/Assigner/TaxonsAssignerInterface.php +++ b/src/Assigner/TaxonsAssignerInterface.php @@ -1,16 +1,10 @@ addCompilerPass(new ImporterCompilerPass()); - $container->addCompilerPass(new MediaProviderPass()); - $container->addCompilerPass(new AuthenticationManagerPolyfillPass()); - } -} diff --git a/src/Command/ImportFromCsvCommand.php b/src/Console/Command/ImportFromCsvCommand.php similarity index 74% rename from src/Command/ImportFromCsvCommand.php rename to src/Console/Command/ImportFromCsvCommand.php index b4008fa28..f5d3f28e0 100644 --- a/src/Command/ImportFromCsvCommand.php +++ b/src/Console/Command/ImportFromCsvCommand.php @@ -1,16 +1,10 @@ setName('bitbag:import:csv') + ->setName('cms:import:csv') ->setDescription('Imports a resource') ->setHelp('This command allows you to import resources from CSV. It takes file path and resource name as parameter.') ->addArgument('resource', InputArgument::REQUIRED, 'Importer resource name.') diff --git a/src/Controller/Action/Admin/ImportDataAction.php b/src/Controller/Action/Admin/ImportDataAction.php index e9164a177..ea21e8512 100644 --- a/src/Controller/Action/Admin/ImportDataAction.php +++ b/src/Controller/Action/Admin/ImportDataAction.php @@ -1,19 +1,13 @@ importProcessor->process($resourceName, $file->getPathname()); - $flashBag->set('success', $this->translator->trans('bitbag_sylius_cms_plugin.ui.successfully_imported')); + $flashBag->set('success', $this->translator->trans('sylius_cms.ui.successfully_imported')); } catch (ImportFailedException $exception) { $flashBag->set('error', $exception->getMessage()); } @@ -66,7 +60,7 @@ public function __invoke(Request $request): Response return new RedirectResponse($referer); } - return new Response($this->twig->render('@BitBagSyliusCmsPlugin/Grid/Form/_importForm.html.twig', [ + return new Response($this->twig->render('@SyliusCmsPlugin/Grid/Form/_importForm.html.twig', [ 'form' => $form->createView(), ])); } diff --git a/src/Controller/Action/Admin/ProductSearchAction.php b/src/Controller/Action/Admin/ProductSearchAction.php index feb882ef6..e8fff2e69 100644 --- a/src/Controller/Action/Admin/ProductSearchAction.php +++ b/src/Controller/Action/Admin/ProductSearchAction.php @@ -1,14 +1,8 @@ getScheme(), $request->getHttpHost()), )); - } catch (\Exception $exception) { + } catch (\Exception) { return new Response('', Response::HTTP_BAD_REQUEST); } diff --git a/src/Controller/Action/Admin/TaxonSearchAction.php b/src/Controller/Action/Admin/TaxonSearchAction.php index 8e8883700..728a259a7 100644 --- a/src/Controller/Action/Admin/TaxonSearchAction.php +++ b/src/Controller/Action/Admin/TaxonSearchAction.php @@ -1,14 +1,8 @@ templateRepository->find($id); + if (null === $template) { + return new JsonResponse([ + 'status' => 'error', + 'message' => 'Template not found', + ]); + } + + return new JsonResponse([ + 'status' => 'success', + 'content' => $template->getContentElements(), + ]); + } +} diff --git a/src/Controller/Action/Admin/UploadEditorImageAction.php b/src/Controller/Action/Admin/UploadEditorImageAction.php index d45b500b5..84a6e7c71 100644 --- a/src/Controller/Action/Admin/UploadEditorImageAction.php +++ b/src/Controller/Action/Admin/UploadEditorImageAction.php @@ -1,18 +1,12 @@ get('code'); /** @var BlockResourceResolverInterface $blockResourceResolver */ - $blockResourceResolver = $this->get('bitbag_sylius_cms_plugin.resolver.block_resource'); + $blockResourceResolver = $this->get('sylius_cms.resolver.block_resource'); $block = $blockResourceResolver->findOrLog($code); if (null === $block) { diff --git a/src/Controller/Helper/FormErrorsFlashHelper.php b/src/Controller/Helper/FormErrorsFlashHelper.php index ab03bedc8..5ec6ef61f 100644 --- a/src/Controller/Helper/FormErrorsFlashHelper.php +++ b/src/Controller/Helper/FormErrorsFlashHelper.php @@ -1,14 +1,8 @@ getMessage(); } - $message = $this->translator->trans('bitbag_sylius_cms_plugin.ui.form_was_submitted_with_errors') . ' ' . rtrim(implode(' ', $errors)); + $message = $this->translator->trans('sylius_cms.ui.form_was_submitted_with_errors') . ' ' . rtrim(implode(' ', $errors)); $session = $this->requestStack->getSession()->getFlashBag(); $session->set('error', $message); diff --git a/src/Controller/Helper/FormErrorsFlashHelperInterface.php b/src/Controller/Helper/FormErrorsFlashHelperInterface.php index 99aa53283..e12a85c10 100644 --- a/src/Controller/Helper/FormErrorsFlashHelperInterface.php +++ b/src/Controller/Helper/FormErrorsFlashHelperInterface.php @@ -1,14 +1,8 @@ getMimeType()); Assert::notNull($media->getType()); - if (1 === preg_match("/image\//", $media->getMimeType()) && 'image' === $media->getType()) { + if ('image' === $media->getType() && 1 === preg_match("/image\//", $media->getMimeType())) { $this->setPathForImageMediaType($media); } else { $this->setPathForNonImageMediaType($media); diff --git a/src/Controller/TemplateController.php b/src/Controller/TemplateController.php deleted file mode 100644 index 1c525ff57..000000000 --- a/src/Controller/TemplateController.php +++ /dev/null @@ -1,34 +0,0 @@ -getDoctrine()->getRepository(TemplateInterface::class)->find($id); - if (null === $template) { - return new JsonResponse([ - 'status' => 'error', - 'message' => 'Template not found', - ]); - } - - return new JsonResponse([ - 'status' => 'success', - 'content' => $template->getContentElements(), - ]); - } -} diff --git a/src/DependencyInjection/BitBagSyliusCmsExtension.php b/src/DependencyInjection/BitBagSyliusCmsExtension.php deleted file mode 100755 index f22888356..000000000 --- a/src/DependencyInjection/BitBagSyliusCmsExtension.php +++ /dev/null @@ -1,45 +0,0 @@ -prependDoctrineMigrations($container); - } - - protected function getMigrationsNamespace(): string - { - return 'BitBag\SyliusCmsPlugin\Migrations'; - } - - protected function getMigrationsDirectory(): string - { - return '@BitBagSyliusCmsPlugin/Migrations'; - } - - protected function getNamespacesOfMigrationsExecutedBefore(): array - { - return ['Sylius\Bundle\CoreBundle\Migrations']; - } -} diff --git a/src/DependencyInjection/Compiler/AuthenticationManagerPolyfillPass.php b/src/DependencyInjection/Compiler/AuthenticationManagerPolyfillPass.php deleted file mode 100644 index 239ad5fde..000000000 --- a/src/DependencyInjection/Compiler/AuthenticationManagerPolyfillPass.php +++ /dev/null @@ -1,21 +0,0 @@ -has('security.authentication_manager') && - true === $container->has('security.authentication.manager') - ) { - $container->setAlias('security.authentication_manager', 'security.authentication.manager'); - } - } -} diff --git a/src/DependencyInjection/Compiler/ContentElementPass.php b/src/DependencyInjection/Compiler/ContentElementPass.php new file mode 100644 index 000000000..685584139 --- /dev/null +++ b/src/DependencyInjection/Compiler/ContentElementPass.php @@ -0,0 +1,57 @@ +findTaggedServiceIds('sylius_cms.content_element') as $id => $attributes) { + if (!isset($attributes[0]['template'])) { + throw new \InvalidArgumentException( + sprintf('Tagged content element "%s" needs to have `template` attribute.', $id), + ); + } + + $definition = $container->getDefinition($id); + $definition->addMethodCall('setTemplate', [$attributes[0]['template']]); + $definition->addMethodCall('setTwigEnvironment', [new Reference('twig')]); + + if (isset($attributes[0]['form_type'])) { + $this->registerFormTypeService($container, $attributes[0]['form_type']); + } + } + } + + private function retrieveElementNameConstantFromFormType(string $formType): string + { + if (!class_exists($formType)) { + throw new \InvalidArgumentException(sprintf('Form type "%s" does not exist.', $formType)); + } + + if (!defined($formType . '::TYPE')) { + throw new \InvalidArgumentException(sprintf('Form type "%s" needs to have "TYPE" constant.', $formType)); + } + + return constant(sprintf('%s::TYPE', $formType)); + } + + private function registerFormTypeService(ContainerBuilder $container, string $formType): void + { + $elementName = $this->retrieveElementNameConstantFromFormType($formType); + $formTypeDefinition = new Definition($formType); + $formTypeDefinition->addTag('form.type'); + $formTypeDefinition->addTag('sylius_cms.content_elements.type', [ + 'key' => $elementName, + ]); + + $container->setDefinition('sylius_cms.form.type.content_element.' . $elementName, $formTypeDefinition); + } +} diff --git a/src/DependencyInjection/Compiler/ImporterCompilerPass.php b/src/DependencyInjection/Compiler/ImporterCompilerPass.php index 7379c5ded..53b2645a3 100644 --- a/src/DependencyInjection/Compiler/ImporterCompilerPass.php +++ b/src/DependencyInjection/Compiler/ImporterCompilerPass.php @@ -1,27 +1,21 @@ has('bitbag_sylius_cms_plugin.importer.chain')) { + if (!$container->has('sylius_cms.importer.chain')) { return; } @@ -31,7 +25,7 @@ public function process(ContainerBuilder $container): void ; $taggedServices = $container->findTaggedServiceIds(self::TAG_ID); - $definition = $container->findDefinition('bitbag_sylius_cms_plugin.importer.chain'); + $definition = $container->findDefinition('sylius_cms.importer.chain'); foreach ($taggedServices as $id => $tags) { $definition->addMethodCall('addImporter', [new Reference($id)]); diff --git a/src/DependencyInjection/Compiler/MediaProviderPass.php b/src/DependencyInjection/Compiler/MediaProviderPass.php index 5e8c80962..80c375fa0 100644 --- a/src/DependencyInjection/Compiler/MediaProviderPass.php +++ b/src/DependencyInjection/Compiler/MediaProviderPass.php @@ -1,14 +1,8 @@ hasDefinition('bitbag_sylius_cms_plugin.registry.media_provider')) { + if (!$container->hasDefinition('sylius_cms.registry.media_provider')) { return; } - $providerRegistry = $container->getDefinition('bitbag_sylius_cms_plugin.registry.media_provider'); + $providerRegistry = $container->getDefinition('sylius_cms.registry.media_provider'); $providers = []; - foreach ($container->findTaggedServiceIds('bitbag_sylius_cms_plugin.media_provider') as $id => $attributes) { - if (!isset($attributes[0]['type']) || !isset($attributes[0]['label'])) { + foreach ($container->findTaggedServiceIds('sylius_cms.media_provider') as $id => $attributes) { + if (!isset($attributes[0]['type'], $attributes[0]['label'])) { throw new \InvalidArgumentException('Tagged media provider needs to have `type` and `label` attribute.'); } @@ -40,6 +34,6 @@ public function process(ContainerBuilder $container): void ksort($providers); - $container->setParameter('bitbag_sylius_cms_plugin.media_providers', $providers); + $container->setParameter('sylius_cms.media_providers', $providers); } } diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php new file mode 100644 index 000000000..9f30f0f0d --- /dev/null +++ b/src/DependencyInjection/Configuration.php @@ -0,0 +1,199 @@ +getRootNode(); + + $this->addResourcesSection($rootNode); + + return $treeBuilder; + } + + private function addResourcesSection(ArrayNodeDefinition $node): void + { + $node + ->children() + ->arrayNode('resources') + ->addDefaultsIfNotSet() + ->children() + ->arrayNode('block') + ->addDefaultsIfNotSet() + ->children() + ->variableNode('options')->end() + ->arrayNode('classes') + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('model')->defaultValue(Block::class)->cannotBeEmpty()->end() + ->scalarNode('interface')->defaultValue(BlockInterface::class)->cannotBeEmpty()->end() + ->scalarNode('controller')->defaultValue(BlockController::class)->cannotBeEmpty()->end() + ->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end() + ->scalarNode('repository')->defaultValue(BlockRepository::class)->cannotBeEmpty()->end() + ->scalarNode('form')->defaultValue(BlockType::class)->cannotBeEmpty()->end() + ->end() + ->end() + ->end() + ->end() + ->arrayNode('collection') + ->addDefaultsIfNotSet() + ->children() + ->variableNode('options')->end() + ->arrayNode('classes') + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('model')->defaultValue(Collection::class)->cannotBeEmpty()->end() + ->scalarNode('interface')->defaultValue(CollectionInterface::class)->cannotBeEmpty()->end() + ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end() + ->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end() + ->scalarNode('repository')->defaultValue(CollectionRepository::class)->cannotBeEmpty()->end() + ->scalarNode('form')->defaultValue(CollectionType::class)->cannotBeEmpty()->end() + ->end() + ->end() + ->end() + ->end() + ->arrayNode('content_configuration') + ->addDefaultsIfNotSet() + ->children() + ->variableNode('options')->end() + ->arrayNode('classes') + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('model')->defaultValue(ContentConfiguration::class)->cannotBeEmpty()->end() + ->scalarNode('interface')->defaultValue(ContentConfigurationInterface::class)->cannotBeEmpty()->end() + ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end() + ->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end() + ->scalarNode('repository')->defaultValue(ContentConfigurationRepository::class)->cannotBeEmpty()->end() + ->scalarNode('form')->defaultValue(ContentConfigurationType::class)->cannotBeEmpty()->end() + ->end() + ->end() + ->end() + ->end() + ->arrayNode('media') + ->addDefaultsIfNotSet() + ->children() + ->variableNode('options')->end() + ->arrayNode('classes') + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('model')->defaultValue(Media::class)->cannotBeEmpty()->end() + ->scalarNode('interface')->defaultValue(MediaInterface::class)->cannotBeEmpty()->end() + ->scalarNode('controller')->defaultValue(MediaController::class)->cannotBeEmpty()->end() + ->scalarNode('factory')->defaultValue(TranslatableFactory::class)->cannotBeEmpty()->end() + ->scalarNode('repository')->defaultValue(MediaRepository::class)->cannotBeEmpty()->end() + ->scalarNode('form')->defaultValue(MediaType::class)->cannotBeEmpty()->end() + ->end() + ->end() + ->arrayNode('translation') + ->addDefaultsIfNotSet() + ->children() + ->arrayNode('classes') + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('model')->defaultValue(MediaTranslation::class)->cannotBeEmpty()->end() + ->scalarNode('interface')->defaultValue(MediaTranslationInterface::class)->cannotBeEmpty()->end() + ->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end() + ->end() + ->end() + ->end() + ->end() + ->end() + ->end() + ->arrayNode('page') + ->addDefaultsIfNotSet() + ->children() + ->variableNode('options')->end() + ->arrayNode('classes') + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('model')->defaultValue(Page::class)->cannotBeEmpty()->end() + ->scalarNode('interface')->defaultValue(PageInterface::class)->cannotBeEmpty()->end() + ->scalarNode('controller')->defaultValue(PageController::class)->cannotBeEmpty()->end() + ->scalarNode('factory')->defaultValue(TranslatableFactory::class)->cannotBeEmpty()->end() + ->scalarNode('repository')->defaultValue(PageRepository::class)->cannotBeEmpty()->end() + ->scalarNode('form')->defaultValue(PageType::class)->cannotBeEmpty()->end() + ->end() + ->end() + ->arrayNode('translation') + ->addDefaultsIfNotSet() + ->children() + ->arrayNode('classes') + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('model')->defaultValue(PageTranslation::class)->cannotBeEmpty()->end() + ->scalarNode('interface')->defaultValue(PageTranslationInterface::class)->cannotBeEmpty()->end() + ->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end() + ->end() + ->end() + ->end() + ->end() + ->end() + ->end() + ->arrayNode('template') + ->addDefaultsIfNotSet() + ->children() + ->variableNode('options')->end() + ->arrayNode('classes') + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('model')->defaultValue(Template::class)->cannotBeEmpty()->end() + ->scalarNode('interface')->defaultValue(TemplateInterface::class)->cannotBeEmpty()->end() + ->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end() + ->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end() + ->scalarNode('repository')->defaultValue(TemplateRepository::class)->cannotBeEmpty()->end() + ->scalarNode('form')->defaultValue(TemplateType::class)->cannotBeEmpty()->end() + ->end() + ->end() + ->end() + ->end() + ->end() + ->end() + ->end() + ; + } +} diff --git a/src/DependencyInjection/SyliusCmsExtension.php b/src/DependencyInjection/SyliusCmsExtension.php new file mode 100755 index 000000000..e90431477 --- /dev/null +++ b/src/DependencyInjection/SyliusCmsExtension.php @@ -0,0 +1,53 @@ +getCurrentConfiguration($container); + + $this->registerResources('sylius_cms', 'doctrine/orm', $config['resources'], $container); + + $this->prependDoctrineMigrations($container); + } + + protected function getMigrationsNamespace(): string + { + return 'Sylius\CmsPlugin\Migrations'; + } + + protected function getMigrationsDirectory(): string + { + return '@SyliusCmsPlugin/Migrations'; + } + + protected function getNamespacesOfMigrationsExecutedBefore(): array + { + return ['Sylius\Bundle\CoreBundle\Migrations']; + } + + private function getCurrentConfiguration(ContainerBuilder $container): array + { + /** @var ConfigurationInterface $configuration */ + $configuration = $this->getConfiguration([], $container); + $configs = $container->getExtensionConfig($this->getAlias()); + + return $this->processConfiguration($configuration, $configs); + } +} diff --git a/src/Doctrine/ORM/Extension/EnabledAndAvailableExtension.php b/src/Doctrine/ORM/Extension/EnabledAndAvailableExtension.php new file mode 100644 index 000000000..6f69d8c66 --- /dev/null +++ b/src/Doctrine/ORM/Extension/EnabledAndAvailableExtension.php @@ -0,0 +1,69 @@ +addEnabledAndChannelCondition($queryBuilder, $queryNameGenerator, $resourceClass); + } + + public function applyToItem( + QueryBuilder $queryBuilder, + QueryNameGeneratorInterface $queryNameGenerator, + string $resourceClass, + array $identifiers, + Operation $operation = null, + array $context = [], + ): void { + $this->addEnabledAndChannelCondition($queryBuilder, $queryNameGenerator, $resourceClass); + } + + private function addEnabledAndChannelCondition(QueryBuilder $queryBuilder, QueryNameGeneratorInterface $queryNameGenerator, string $resourceClass): void + { + $rootAlias = $queryBuilder->getRootAliases()[0]; + + $user = $this->userContext->getUser(); + if (null !== $user && in_array('ROLE_API_ACCESS', $user->getRoles(), true)) { + return; + } + + if (in_array(ToggleableInterface::class, (array) class_implements($resourceClass), true)) { + $queryBuilder + ->andWhere(sprintf('%s.enabled = :enabled', $rootAlias)) + ->setParameter('enabled', true); + } + + if (in_array(ChannelsAwareInterface::class, (array) class_implements($resourceClass), true)) { + $channelAlias = $queryNameGenerator->generateJoinAlias('channel'); + $queryBuilder + ->innerJoin(sprintf('%s.channels', $rootAlias), $channelAlias) + ->andWhere(sprintf('%s.code = :channel', $channelAlias)) + ->setParameter('channel', $this->channelContext->getChannel()->getCode()); + } + } +} diff --git a/src/Downloader/ImageDownloader.php b/src/Downloader/ImageDownloader.php deleted file mode 100644 index 93743c481..000000000 --- a/src/Downloader/ImageDownloader.php +++ /dev/null @@ -1,39 +0,0 @@ -filesystem->dumpFile($path, $contents); - - return new UploadedFile($path, $originalName); - } -} diff --git a/src/Downloader/ImageDownloaderInterface.php b/src/Downloader/ImageDownloaderInterface.php deleted file mode 100644 index f483dbf69..000000000 --- a/src/Downloader/ImageDownloaderInterface.php +++ /dev/null @@ -1,18 +0,0 @@ -initializeCollectionsCollection(); $this->initializeChannelsCollection(); $this->initializeContentElementsCollection(); - $this->initializeLocalesCollection(); $this->initializeProductsCollection(); $this->initializeTaxonCollection(); $this->initializeProductsInTaxonsCollection(); diff --git a/src/Entity/BlockInterface.php b/src/Entity/BlockInterface.php index d0e9d8bee..d3deca301 100755 --- a/src/Entity/BlockInterface.php +++ b/src/Entity/BlockInterface.php @@ -1,14 +1,8 @@ configuration = $configuration; } + public function getLocale(): ?string + { + return $this->locale; + } + + public function setLocale(?string $locale): void + { + $this->locale = $locale; + } + public function getBlock(): ?BlockInterface { return $this->block; @@ -68,13 +72,4 @@ public function setPage(?PageInterface $page): void { $this->page = $page; } - - public function getContent(): ?string - { - if (TextareaContentElementType::TYPE === $this->type) { - return $this->configuration[TextareaContentElementType::TYPE] ?? null; - } - - return null; - } } diff --git a/src/Entity/ContentConfigurationInterface.php b/src/Entity/ContentConfigurationInterface.php index bdbff2041..b593a3c2c 100644 --- a/src/Entity/ContentConfigurationInterface.php +++ b/src/Entity/ContentConfigurationInterface.php @@ -1,20 +1,12 @@ saveWithOriginalName = $saveWithOriginalName; } - /** - * @return MediaTranslationInterface|TranslationInterface - */ protected function getMediaTranslation(): TranslationInterface { return $this->getTranslation(); diff --git a/src/Entity/MediaCollectionInterface.php b/src/Entity/MediaCollectionInterface.php index 45c1dd98e..55344601a 100644 --- a/src/Entity/MediaCollectionInterface.php +++ b/src/Entity/MediaCollectionInterface.php @@ -1,14 +1,8 @@ setMetaDescription($metaDescription); } + public function getTeaserTitle(): ?string + { + /** @var PageTranslationInterface $pageTranslationInterface */ + $pageTranslationInterface = $this->getPageTranslation(); + + return $pageTranslationInterface->getTeaserTitle(); + } + + public function setTeaserTitle(?string $teaserTitle): void + { + /** @var PageTranslationInterface $pageTranslationInterface */ + $pageTranslationInterface = $this->getPageTranslation(); + $pageTranslationInterface->setTeaserTitle($teaserTitle); + } + + public function getTeaserContent(): ?string + { + /** @var PageTranslationInterface $pageTranslationInterface */ + $pageTranslationInterface = $this->getPageTranslation(); + + return $pageTranslationInterface->getTeaserContent(); + } + + public function setTeaserContent(?string $teaserContent): void + { + /** @var PageTranslationInterface $pageTranslationInterface */ + $pageTranslationInterface = $this->getPageTranslation(); + $pageTranslationInterface->setTeaserContent($teaserContent); + } + + public function getTeaserImage(): ?MediaInterface + { + /** @var PageTranslationInterface $pageTranslationInterface */ + $pageTranslationInterface = $this->getPageTranslation(); + + return $pageTranslationInterface->getTeaserImage(); + } + + public function setTeaserImage(?MediaInterface $teaserImage): void + { + /** @var PageTranslationInterface $pageTranslationInterface */ + $pageTranslationInterface = $this->getPageTranslation(); + $pageTranslationInterface->setTeaserImage($teaserImage); + } + public function getName(): ?string { return $this->name; @@ -149,9 +186,6 @@ public function setPublishAt(?\DateTimeImmutable $publishAt): void $this->publishAt = $publishAt; } - /** - * @return PageTranslationInterface|TranslationInterface - */ protected function getPageTranslation(): TranslationInterface { return $this->getTranslation(); diff --git a/src/Entity/PageInterface.php b/src/Entity/PageInterface.php index a4cd46275..c3aafb986 100755 --- a/src/Entity/PageInterface.php +++ b/src/Entity/PageInterface.php @@ -1,14 +1,8 @@ setLocale($locale ?? 'en_US'); + $contentConfiguration->setType('heading'); + $contentConfiguration->setConfiguration([ + 'heading_type' => $headingType ?? 'h1', + 'heading' => $headingContent, + ]); + + return $contentConfiguration; + } + + public static function createTextareaContentElement(?string $locale, ?string $content): ?ContentConfiguration + { + if (null === $content) { + return null; + } + + $contentConfiguration = new ContentConfiguration(); + $contentConfiguration->setLocale($locale ?? 'en_US'); + $contentConfiguration->setType('textarea'); + $contentConfiguration->setConfiguration([ + 'textarea' => $content, + ]); + + return $contentConfiguration; + } + + public static function createProductsGridContentElement(?string $locale, ?string $codes): ?ContentConfiguration + { + if (null === $codes) { + return null; + } + + $productsCodes = explode(',', $codes); + $productsCodes = array_map(static function (string $element): string { + return trim($element); + }, $productsCodes); + + $contentConfiguration = new ContentConfiguration(); + $contentConfiguration->setLocale($locale ?? 'en_US'); + $contentConfiguration->setType('products_grid'); + $contentConfiguration->setConfiguration([ + 'products_grid' => [ + 'products' => $productsCodes, + ], + ]); + + return $contentConfiguration; + } + + public static function createSingleMediaContentElement(?string $locale, ?string $code): ?ContentConfiguration + { + if (null === $code) { + return null; + } + + $contentConfiguration = new ContentConfiguration(); + $contentConfiguration->setLocale($locale ?? 'en_US'); + $contentConfiguration->setType('single_media'); + $contentConfiguration->setConfiguration([ + 'single_media' => $code, + ]); + + return $contentConfiguration; + } +} diff --git a/src/Fixture/BlockFixture.php b/src/Fixture/BlockFixture.php index e499c3092..46ebb4bba 100755 --- a/src/Fixture/BlockFixture.php +++ b/src/Fixture/BlockFixture.php @@ -1,17 +1,11 @@ booleanNode('enabled')->defaultTrue()->end() ->arrayNode('collections')->scalarPrototype()->end()->end() ->arrayNode('channels')->scalarPrototype()->end()->end() - ->arrayNode('locales')->scalarPrototype()->end()->end() ->arrayNode('products')->scalarPrototype()->end()->end() ->arrayNode('taxons')->scalarPrototype()->end()->end() ->arrayNode('products_in_taxons')->scalarPrototype()->end()->end() ->arrayNode('content_elements') - ->useAttributeAsKey('key') + ->useAttributeAsKey('locale') + ->arrayPrototype() + ->useAttributeAsKey('key') ->arrayPrototype() ->children() ->scalarNode('type')->end() @@ -60,7 +55,6 @@ protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void ->scalarNode('products_carousel_by_taxon')->end() ->scalarNode('products_grid_by_taxon')->end() ->scalarNode('pages_collection')->end() - ->scalarNode('pages_collection')->end() ->scalarNode('spacer')->end() ->arrayNode('multiple_media')->scalarPrototype()->end()->end() ->arrayNode('products_grid') diff --git a/src/Fixture/CollectionFixture.php b/src/Fixture/CollectionFixture.php index 88f963f27..907e3544a 100755 --- a/src/Fixture/CollectionFixture.php +++ b/src/Fixture/CollectionFixture.php @@ -1,17 +1,11 @@ collectionsAssigner->assign($block, $blockData['collections']); $this->channelAssigner->assign($block, $blockData['channels']); - $this->localesAssigner->assign($block, $blockData['locales']); $this->productsAssigner->assign($block, $blockData['products']); $this->taxonsAssigner->assign($block, $blockData['taxons']); $this->productsInTaxonsAssigner->assign($block, $blockData['products_in_taxons']); - foreach ($blockData['content_elements'] as $data) { - $data['data'] = array_filter($data['data'], static function ($value) { - return !empty($value); - }); + foreach ($blockData['content_elements'] as $locale => $data) { + foreach ($data as $contentElementData) { + $contentElementData['data'] = array_filter($contentElementData['data'], static function ($value) { + return !empty($value); + }); - $contentConfiguration = new ContentConfiguration(); - $contentConfiguration->setType($data['type']); - $contentConfiguration->setConfiguration($data['data']); - $contentConfiguration->setBlock($block); - $block->addContentElement($contentConfiguration); + $contentConfiguration = new ContentConfiguration(); + $contentConfiguration->setType($contentElementData['type']); + $contentConfiguration->setConfiguration($contentElementData['data']); + $contentConfiguration->setLocale($locale); + $contentConfiguration->setBlock($block); + $block->addContentElement($contentConfiguration); + } } $this->blockRepository->add($block); diff --git a/src/Fixture/Factory/CollectionFixtureFactory.php b/src/Fixture/Factory/CollectionFixtureFactory.php index 253d92bcb..48e7605bb 100755 --- a/src/Fixture/Factory/CollectionFixtureFactory.php +++ b/src/Fixture/Factory/CollectionFixtureFactory.php @@ -1,19 +1,13 @@ setName($pageData['name']); $page->setEnabled($pageData['enabled']); - /** @var MediaInterface|null $mediaImage */ - $mediaImage = $this->mediaRepository->findOneBy(['code' => $pageData['teaser_image']]); - if ($mediaImage) { - $page->setTeaserImage($mediaImage); - } - - $page->setTeaserTitle($pageData['teaser_title']); - $page->setTeaserContent($pageData['teaser_content']); - foreach ($pageData['translations'] as $localeCode => $translation) { /** @var PageTranslationInterface $pageTranslation */ $pageTranslation = $this->pageTranslationFactory->createNew(); @@ -81,20 +66,31 @@ private function createPage( $pageTranslation->setTitle($translation['meta_title']); $pageTranslation->setMetaKeywords($translation['meta_keywords']); $pageTranslation->setMetaDescription($translation['meta_description']); + $pageTranslation->setTeaserTitle($translation['teaser_title']); + $pageTranslation->setTeaserContent($translation['teaser_content']); + + /** @var MediaInterface|null $mediaImage */ + $mediaImage = $this->mediaRepository->findOneBy(['code' => $translation['teaser_image']]); + if ($mediaImage) { + $pageTranslation->setTeaserImage($mediaImage); + } $page->addTranslation($pageTranslation); } - foreach ($pageData['content_elements'] as $data) { - $data['data'] = array_filter($data['data'], static function ($value) { - return !empty($value); - }); - - $contentConfiguration = new ContentConfiguration(); - $contentConfiguration->setType($data['type']); - $contentConfiguration->setConfiguration($data['data']); - $contentConfiguration->setPage($page); - $page->addContentElement($contentConfiguration); + foreach ($pageData['content_elements'] as $locale => $data) { + foreach ($data as $contentElementData) { + $contentElementData['data'] = array_filter($contentElementData['data'], static function ($value) { + return !empty($value); + }); + + $contentConfiguration = new ContentConfiguration(); + $contentConfiguration->setType($contentElementData['type']); + $contentConfiguration->setConfiguration($contentElementData['data']); + $contentConfiguration->setLocale($locale); + $contentConfiguration->setPage($page); + $page->addContentElement($contentConfiguration); + } } $this->pageRepository->add($page); diff --git a/src/Fixture/Factory/TemplateFixtureFactory.php b/src/Fixture/Factory/TemplateFixtureFactory.php index 4d4ffa7bb..4a9bbd051 100755 --- a/src/Fixture/Factory/TemplateFixtureFactory.php +++ b/src/Fixture/Factory/TemplateFixtureFactory.php @@ -1,16 +1,10 @@ scalarNode('name')->end() ->arrayNode('collections')->scalarPrototype()->end()->end() ->arrayNode('channels')->scalarPrototype()->end()->end() - ->scalarNode('teaser_title')->defaultNull()->end() - ->scalarNode('teaser_content')->defaultNull()->end() - ->scalarNode('teaser_image')->defaultNull()->end() ->arrayNode('translations') ->prototype('array') ->children() @@ -52,11 +43,16 @@ protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void ->scalarNode('meta_title')->defaultNull()->end() ->scalarNode('meta_keywords')->defaultNull()->end() ->scalarNode('meta_description')->defaultNull()->end() + ->scalarNode('teaser_title')->defaultNull()->end() + ->scalarNode('teaser_content')->defaultNull()->end() + ->scalarNode('teaser_image')->defaultNull()->end() ->end() ->end() ->end() ->arrayNode('content_elements') - ->useAttributeAsKey('key') + ->useAttributeAsKey('locale') + ->arrayPrototype() + ->useAttributeAsKey('key') ->arrayPrototype() ->children() ->scalarNode('type')->end() diff --git a/src/Fixture/TemplateFixture.php b/src/Fixture/TemplateFixture.php index 5cfdc9b62..056895bb0 100755 --- a/src/Fixture/TemplateFixture.php +++ b/src/Fixture/TemplateFixture.php @@ -1,17 +1,11 @@ setDefaults([ - 'resource' => 'bitbag_sylius_cms_plugin.template', + 'resource' => 'sylius_cms.template', 'choice_name' => 'name', 'choice_value' => 'id', ]); diff --git a/src/Form/Type/BlockAutocompleteChoiceType.php b/src/Form/Type/BlockAutocompleteChoiceType.php index f99a4a6fc..3dc7139a7 100644 --- a/src/Form/Type/BlockAutocompleteChoiceType.php +++ b/src/Form/Type/BlockAutocompleteChoiceType.php @@ -1,14 +1,8 @@ setDefaults([ - 'resource' => 'bitbag_sylius_cms_plugin.block', + 'resource' => 'sylius_cms.block', 'choice_name' => 'name', 'choice_value' => 'code', ]); @@ -38,7 +32,7 @@ public function buildView( public function getBlockPrefix(): string { - return 'bitbag_block_autocomplete_choice'; + return 'sylius_block_autocomplete_choice'; } public function getParent(): string diff --git a/src/Form/Type/BlockType.php b/src/Form/Type/BlockType.php index 6713a45cf..497d8f21c 100755 --- a/src/Form/Type/BlockType.php +++ b/src/Form/Type/BlockType.php @@ -1,27 +1,40 @@ localeRepository->findAll(); + foreach ($locales as $locale) { + $this->locales[$locale->getName()] = $locale->getCode(); + } + } + public function buildForm(FormBuilderInterface $builder, array $options): void { /** @var BlockInterface $block */ @@ -29,26 +42,25 @@ public function buildForm(FormBuilderInterface $builder, array $options): void $builder ->add('code', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.code', + 'label' => 'sylius_cms.ui.code', 'disabled' => null !== $block->getCode(), ]) ->add('name', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.name', + 'label' => 'sylius_cms.ui.name', ]) ->add('collections', CollectionAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.collections', + 'label' => 'sylius_cms.ui.collections', 'multiple' => true, ]) ->add('enabled', CheckboxType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.enabled', + 'label' => 'sylius_cms.ui.enabled', ]) ->add('channels', ChannelChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.channels', + 'label' => 'sylius_cms.ui.channels', 'required' => false, 'multiple' => true, 'expanded' => true, ]) - ->add('locales') ->add('contentElements', CollectionType::class, [ 'label' => false, 'entry_type' => ContentConfigurationType::class, @@ -56,31 +68,47 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'allow_delete' => true, 'by_reference' => false, 'required' => false, + 'entry_options' => [ + 'label' => false, + ], + 'attr' => [ + 'class' => 'content-elements-container', + ], ]) ->add('products', ProductAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.display_for_products.label', + 'label' => 'sylius_cms.ui.display_for_products.label', 'multiple' => true, - 'help' => 'bitbag_sylius_cms_plugin.ui.display_for_products.help', + 'help' => 'sylius_cms.ui.display_for_products.help', ]) ->add('productsInTaxons', TaxonAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.display_for_products_in_taxons.label', + 'label' => 'sylius_cms.ui.display_for_products_in_taxons.label', 'multiple' => true, - 'help' => 'bitbag_sylius_cms_plugin.ui.display_for_products_in_taxons.help', + 'help' => 'sylius_cms.ui.display_for_products_in_taxons.help', ]) ->add('taxons', TaxonAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.display_for_taxons.label', + 'label' => 'sylius_cms.ui.display_for_taxons.label', 'multiple' => true, - 'help' => 'bitbag_sylius_cms_plugin.ui.display_for_taxons.help', + 'help' => 'sylius_cms.ui.display_for_taxons.help', ]) ->add('template', TemplateBlockAutocompleteChoiceType::class, [ 'label' => false, 'mapped' => false, ]) + ->add('locale', ChoiceType::class, [ + 'choices' => $this->locales, + 'mapped' => false, + 'label' => 'sylius.ui.locale', + 'attr' => [ + 'class' => 'locale-selector', + ], + ]) ; + + PageType::addContentElementLocaleListener($builder); } public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_block'; + return 'sylius_cms_block'; } } diff --git a/src/Form/Type/CollectionAutocompleteChoiceType.php b/src/Form/Type/CollectionAutocompleteChoiceType.php index 1ac306653..6d13254e9 100755 --- a/src/Form/Type/CollectionAutocompleteChoiceType.php +++ b/src/Form/Type/CollectionAutocompleteChoiceType.php @@ -1,14 +1,8 @@ setDefaults([ - 'resource' => 'bitbag_sylius_cms_plugin.collection', + 'resource' => 'sylius_cms.collection', 'choice_name' => 'name', 'choice_value' => 'code', ]); @@ -38,7 +32,7 @@ public function buildView( public function getBlockPrefix(): string { - return 'bitbag_collection_autocomplete_choice'; + return 'sylius_collection_autocomplete_choice'; } public function getParent(): string diff --git a/src/Form/Type/CollectionType.php b/src/Form/Type/CollectionType.php index 6478f89da..1a806737b 100755 --- a/src/Form/Type/CollectionType.php +++ b/src/Form/Type/CollectionType.php @@ -1,14 +1,8 @@ add('code', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.code', + 'label' => 'sylius_cms.ui.code', 'disabled' => null !== $builder->getData()->getCode(), ]) ->add('name', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.name', + 'label' => 'sylius_cms.ui.name', ]) ->add('type', ChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.type', + 'label' => 'sylius_cms.ui.type', 'choices' => [ - 'bitbag_sylius_cms_plugin.ui.page' => self::PAGE, - 'bitbag_sylius_cms_plugin.ui.block' => self::BLOCK, - 'bitbag_sylius_cms_plugin.ui.media' => self::MEDIA, + 'sylius_cms.ui.page' => self::PAGE, + 'sylius_cms.ui.block' => self::BLOCK, + 'sylius_cms.ui.media' => self::MEDIA, ], ]) ->add('pages', PageAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.pages', + 'label' => 'sylius_cms.ui.pages', 'multiple' => true, ]) ->add('blocks', BlockAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.blocks', + 'label' => 'sylius_cms.ui.blocks', 'multiple' => true, ]) ->add('media', MediaAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.media', + 'label' => 'sylius_cms.ui.media', 'multiple' => true, ]) ->addEventListener(FormEvents::PRE_SUBMIT, function (PreSubmitEvent $event): void { @@ -78,6 +72,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_collection'; + return 'sylius_cms_collection'; } } diff --git a/src/Form/Type/ContentConfigurationType.php b/src/Form/Type/ContentConfigurationType.php index ead59d4e8..f6572e438 100644 --- a/src/Form/Type/ContentConfigurationType.php +++ b/src/Form/Type/ContentConfigurationType.php @@ -1,18 +1,13 @@ $formType) { $this->actionConfigurationTypes[$type] = $formType::class; - $this->actionTypes['bitbag_sylius_cms_plugin.ui.content_elements.type.' . $type] = $type; + $this->actionTypes['sylius_cms.ui.content_elements.type.' . $type] = $type; } } @@ -44,13 +39,14 @@ public function buildForm(FormBuilderInterface $builder, array $options): void $defaultActionConfigurationType = $this->actionConfigurationTypes[$defaultActionType]; $builder + ->add('locale', HiddenType::class) ->add('type', ChoiceType::class, [ 'label' => 'sylius.ui.type', 'choices' => $this->actionTypes, 'choice_attr' => function (?string $type) use ($builder): array { return [ 'data-configuration' => $this->twig->render( - '@BitBagSyliusCmsPlugin/ContentConfiguration/_action.html.twig', + '@SyliusCmsPlugin/ContentConfiguration/_action.html.twig', [ 'field' => $builder->create( 'configuration', @@ -112,6 +108,6 @@ private function addConfigurationTypeToForm(FormEvent $event): void public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_content_configuration'; + return 'sylius_cms_content_configuration'; } } diff --git a/src/Form/Type/ContentElementType.php b/src/Form/Type/ContentElementType.php index 1be324c93..4d3091c56 100644 --- a/src/Form/Type/ContentElementType.php +++ b/src/Form/Type/ContentElementType.php @@ -1,14 +1,8 @@ contentElementTypes as $type => $formType) { - $this->contentElements['bitbag_sylius_cms_plugin.ui.content_elements.type.' . $type] = $type; + $this->contentElements['sylius_cms.ui.content_elements.type.' . $type] = $type; } } @@ -30,7 +24,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void { $builder ->add('type', ChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.type', + 'label' => 'sylius_cms.ui.type', 'choices' => $this->contentElements, ]) ; diff --git a/src/Form/Type/ContentElements/HeadingContentElementType.php b/src/Form/Type/ContentElements/HeadingContentElementType.php index 49d2ef3f5..2eea9757f 100644 --- a/src/Form/Type/ContentElements/HeadingContentElementType.php +++ b/src/Form/Type/ContentElements/HeadingContentElementType.php @@ -1,14 +1,8 @@ add('heading_type', ChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.content_elements.heading_type', + 'label' => 'sylius_cms.ui.content_elements.heading_type', 'choices' => [ 'H1' => 'h1', 'H2' => 'h2', @@ -36,13 +30,13 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'empty_data' => 'h1', ]) ->add(self::TYPE, TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.content_elements.type.' . self::TYPE, + 'label' => 'sylius_cms.ui.content_elements.type.' . self::TYPE, ]) ; } public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_content_elements_' . self::TYPE; + return 'sylius_cms_content_elements_' . self::TYPE; } } diff --git a/src/Form/Type/ContentElements/MultipleMediaContentElementType.php b/src/Form/Type/ContentElements/MultipleMediaContentElementType.php index 4406258f6..0d5fcec9c 100644 --- a/src/Form/Type/ContentElements/MultipleMediaContentElementType.php +++ b/src/Form/Type/ContentElements/MultipleMediaContentElementType.php @@ -1,16 +1,10 @@ add(self::TYPE, MediaAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.content_elements.type.' . self::TYPE, + 'label' => 'sylius_cms.ui.content_elements.type.' . self::TYPE, 'multiple' => true, ]) ; @@ -37,6 +31,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_content_elements_' . self::TYPE; + return 'sylius_cms_content_elements_' . self::TYPE; } } diff --git a/src/Form/Type/ContentElements/PagesCollectionContentElementType.php b/src/Form/Type/ContentElements/PagesCollectionContentElementType.php index a2ffc366f..410bb3ec3 100644 --- a/src/Form/Type/ContentElements/PagesCollectionContentElementType.php +++ b/src/Form/Type/ContentElements/PagesCollectionContentElementType.php @@ -1,18 +1,12 @@ add(self::TYPE, PageCollectionAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.content_elements.type.' . self::TYPE, + 'label' => 'sylius_cms.ui.content_elements.type.' . self::TYPE, ]) ; @@ -45,6 +39,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_content_elements_' . self::TYPE; + return 'sylius_cms_content_elements_' . self::TYPE; } } diff --git a/src/Form/Type/ContentElements/ProductsCarouselByTaxonContentElementType.php b/src/Form/Type/ContentElements/ProductsCarouselByTaxonContentElementType.php index d39aa28fa..b3ff0b0c8 100644 --- a/src/Form/Type/ContentElements/ProductsCarouselByTaxonContentElementType.php +++ b/src/Form/Type/ContentElements/ProductsCarouselByTaxonContentElementType.php @@ -1,18 +1,12 @@ add(self::TYPE, TaxonAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.taxon', + 'label' => 'sylius_cms.ui.taxon', 'choice_value' => 'code', 'resource' => 'sylius.taxon', ]) @@ -47,6 +41,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_content_elements_' . self::TYPE; + return 'sylius_cms_content_elements_' . self::TYPE; } } diff --git a/src/Form/Type/ContentElements/ProductsCarouselContentElementType.php b/src/Form/Type/ContentElements/ProductsCarouselContentElementType.php index 990c54c95..e8ab722f1 100644 --- a/src/Form/Type/ContentElements/ProductsCarouselContentElementType.php +++ b/src/Form/Type/ContentElements/ProductsCarouselContentElementType.php @@ -1,14 +1,8 @@ add(self::TYPE, TaxonAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.taxon', + 'label' => 'sylius_cms.ui.taxon', 'choice_value' => 'code', 'resource' => 'sylius.taxon', ]) @@ -47,6 +41,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_content_elements_' . self::TYPE; + return 'sylius_cms_content_elements_' . self::TYPE; } } diff --git a/src/Form/Type/ContentElements/ProductsGridContentElementType.php b/src/Form/Type/ContentElements/ProductsGridContentElementType.php index a46743372..bcf15f037 100644 --- a/src/Form/Type/ContentElements/ProductsGridContentElementType.php +++ b/src/Form/Type/ContentElements/ProductsGridContentElementType.php @@ -1,14 +1,8 @@ add(self::TYPE, MediaAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.content_elements.type.' . self::TYPE, + 'label' => 'sylius_cms.ui.content_elements.type.' . self::TYPE, ]) ; @@ -45,6 +39,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_content_elements_' . self::TYPE; + return 'sylius_cms_content_elements_' . self::TYPE; } } diff --git a/src/Form/Type/ContentElements/SpacerContentElementType.php b/src/Form/Type/ContentElements/SpacerContentElementType.php index adb0a5d19..ca2d45e34 100644 --- a/src/Form/Type/ContentElements/SpacerContentElementType.php +++ b/src/Form/Type/ContentElements/SpacerContentElementType.php @@ -1,14 +1,8 @@ add(self::TYPE, NumberType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.content_elements.type.' . self::TYPE . '_height', + 'label' => 'sylius_cms.ui.content_elements.type.' . self::TYPE . '_height', 'attr' => [ 'min' => 0, ], @@ -33,6 +27,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_content_elements_' . self::TYPE; + return 'sylius_cms_content_elements_' . self::TYPE; } } diff --git a/src/Form/Type/ContentElements/TaxonsListContentElementType.php b/src/Form/Type/ContentElements/TaxonsListContentElementType.php index d3da4df7f..3ac14c567 100644 --- a/src/Form/Type/ContentElements/TaxonsListContentElementType.php +++ b/src/Form/Type/ContentElements/TaxonsListContentElementType.php @@ -1,14 +1,8 @@ add(self::TYPE, WysiwygType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.content_elements.type.' . self::TYPE, + 'label' => 'sylius_cms.ui.content_elements.type.' . self::TYPE, ]) ; } public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_content_elements_' . self::TYPE; + return 'sylius_cms_content_elements_' . self::TYPE; } } diff --git a/src/Form/Type/ImportType.php b/src/Form/Type/ImportType.php index 0c5651259..f1d4b2916 100644 --- a/src/Form/Type/ImportType.php +++ b/src/Form/Type/ImportType.php @@ -1,14 +1,8 @@ true, 'constraints' => [ new NotNull([ - 'message' => 'bitbag_sylius_cms_plugin.import.not_blank', + 'message' => 'sylius_cms.import.not_blank', ]), new File([ 'mimeTypes' => ['text/csv', 'text/plain'], - 'mimeTypesMessage' => 'bitbag_sylius_cms_plugin.import.invalid_format', + 'mimeTypesMessage' => 'sylius_cms.import.invalid_format', ]), ], ]); diff --git a/src/Form/Type/MediaAutocompleteChoiceType.php b/src/Form/Type/MediaAutocompleteChoiceType.php index 397cd5902..045511602 100644 --- a/src/Form/Type/MediaAutocompleteChoiceType.php +++ b/src/Form/Type/MediaAutocompleteChoiceType.php @@ -1,17 +1,11 @@ setDefaults([ - 'resource' => 'bitbag_sylius_cms_plugin.media', + 'resource' => 'sylius_cms.media', 'choice_name' => 'name', 'choice_value' => 'code', 'media_type' => [ @@ -45,7 +39,7 @@ public function buildView( public function getBlockPrefix(): string { - return 'bitbag_media_autocomplete_choice'; + return 'sylius_media_autocomplete_choice'; } public function getParent(): string diff --git a/src/Form/Type/MediaImageAutocompleteChoiceType.php b/src/Form/Type/MediaImageAutocompleteChoiceType.php index badf0cb17..2b7e67822 100644 --- a/src/Form/Type/MediaImageAutocompleteChoiceType.php +++ b/src/Form/Type/MediaImageAutocompleteChoiceType.php @@ -1,17 +1,11 @@ setDefaults([ - 'resource' => 'bitbag_sylius_cms_plugin.media', + 'resource' => 'sylius_cms.media', 'choice_name' => 'name', 'choice_value' => 'code', 'media_type' => [MediaInterface::IMAGE_TYPE], @@ -41,7 +35,7 @@ public function buildView( public function getBlockPrefix(): string { - return 'bitbag_media_autocomplete_choice'; + return 'sylius_media_autocomplete_choice'; } public function getParent(): string diff --git a/src/Form/Type/MediaType.php b/src/Form/Type/MediaType.php index 4672b2dd9..4cdc7a749 100644 --- a/src/Form/Type/MediaType.php +++ b/src/Form/Type/MediaType.php @@ -1,19 +1,13 @@ add('code', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.code', + 'label' => 'sylius_cms.ui.code', 'disabled' => null !== $data && null !== $data->getCode(), ]) ->add('name', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.name', + 'label' => 'sylius_cms.ui.name', ]) ->add('type', ChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.type', + 'label' => 'sylius_cms.ui.type', 'choices' => $this->providers, ]) ->add('file', FileType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.file', + 'label' => 'sylius_cms.ui.file', ]) ->add('collections', CollectionAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.collections', + 'label' => 'sylius_cms.ui.collections', 'multiple' => true, ]) ->add('enabled', CheckboxType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.enabled', + 'label' => 'sylius_cms.ui.enabled', ]) ->add('saveWithOriginalName', CheckboxType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.save_with_original_name', + 'label' => 'sylius_cms.ui.save_with_original_name', ]) ->add('channels', ChannelChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.channels', + 'label' => 'sylius_cms.ui.channels', 'required' => false, 'multiple' => true, 'expanded' => true, ]) ->add('path', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.path', + 'label' => 'sylius_cms.ui.path', 'disabled' => true, 'required' => false, ]) @@ -83,6 +76,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_media'; + return 'sylius_cms_media'; } } diff --git a/src/Form/Type/PageAutocompleteChoiceType.php b/src/Form/Type/PageAutocompleteChoiceType.php index b1fd7639b..86c27d7be 100644 --- a/src/Form/Type/PageAutocompleteChoiceType.php +++ b/src/Form/Type/PageAutocompleteChoiceType.php @@ -1,14 +1,8 @@ setDefaults([ - 'resource' => 'bitbag_sylius_cms_plugin.page', + 'resource' => 'sylius_cms.page', 'choice_name' => 'name', 'choice_value' => 'code', ]); @@ -38,7 +32,7 @@ public function buildView( public function getBlockPrefix(): string { - return 'bitbag_page_autocomplete_choice'; + return 'sylius_page_autocomplete_choice'; } public function getParent(): string diff --git a/src/Form/Type/PageCollectionAutocompleteChoiceType.php b/src/Form/Type/PageCollectionAutocompleteChoiceType.php index cb985025d..7f543b0ec 100755 --- a/src/Form/Type/PageCollectionAutocompleteChoiceType.php +++ b/src/Form/Type/PageCollectionAutocompleteChoiceType.php @@ -1,14 +1,8 @@ setDefaults([ - 'resource' => 'bitbag_sylius_cms_plugin.collection', + 'resource' => 'sylius_cms.collection', 'choice_name' => 'name', 'choice_value' => 'code', ]); @@ -38,7 +32,7 @@ public function buildView( public function getBlockPrefix(): string { - return 'bitbag_page_collection_autocomplete_choice'; + return 'sylius_page_collection_autocomplete_choice'; } public function getParent(): string diff --git a/src/Form/Type/PageType.php b/src/Form/Type/PageType.php index 9834f9256..6b02ddb78 100755 --- a/src/Form/Type/PageType.php +++ b/src/Form/Type/PageType.php @@ -1,57 +1,72 @@ localeRepository->findAll(); + foreach ($locales as $locale) { + $this->locales[$locale->getName()] = $locale->getCode(); + } + } + public function buildForm(FormBuilderInterface $builder, array $options): void { $builder ->add('code', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.code', + 'label' => 'sylius_cms.ui.code', 'disabled' => null !== $builder->getData()->getCode(), ]) ->add('name', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.name', + 'label' => 'sylius_cms.ui.name', ]) ->add('enabled', CheckboxType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.enabled', + 'label' => 'sylius_cms.ui.enabled', ]) ->add('translations', ResourceTranslationsType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.images', + 'label' => 'sylius_cms.ui.images', 'entry_type' => PageTranslationType::class, ]) ->add('collections', CollectionAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.collections', + 'label' => 'sylius_cms.ui.collections', 'multiple' => true, ]) ->add('channels', ChannelChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.channels', + 'label' => 'sylius_cms.ui.channels', 'required' => false, 'multiple' => true, 'expanded' => true, ]) ->add('publishAt', DateTimeType::class, [ 'input' => 'datetime_immutable', - 'label' => 'bitbag_sylius_cms_plugin.ui.publish_at', + 'label' => 'sylius_cms.ui.publish_at', 'date_widget' => 'single_text', 'time_widget' => 'single_text', 'required' => false, @@ -63,28 +78,50 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'allow_delete' => true, 'by_reference' => false, 'required' => false, + 'entry_options' => [ + 'label' => false, + ], + 'attr' => [ + 'class' => 'content-elements-container', + ], ]) ->add('template', TemplatePageAutocompleteChoiceType::class, [ 'label' => false, 'mapped' => false, ]) - ->add('teaserTitle', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.teaser.title', - 'required' => false, - ]) - ->add('teaserContent', WysiwygType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.teaser.content', - 'required' => false, - ]) - ->add('teaserImage', MediaImageAutocompleteChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.teaser.image', - 'required' => false, + ->add('locale', ChoiceType::class, [ + 'choices' => $this->locales, + 'mapped' => false, + 'label' => 'sylius.ui.locale', + 'attr' => [ + 'class' => 'locale-selector', + ], ]) ; + + self::addContentElementLocaleListener($builder); + } + + public static function addContentElementLocaleListener(FormBuilderInterface $builder): void + { + $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { + $data = $event->getData(); + $selectedLocale = $data['locale'] ?? null; + + if (isset($data['contentElements'])) { + foreach ($data['contentElements'] as &$contentElement) { + if (empty($contentElement['locale'])) { + $contentElement['locale'] = $selectedLocale; + } + } + } + + $event->setData($data); + }); } public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_page'; + return 'sylius_cms_page'; } } diff --git a/src/Form/Type/TemplateBlockAutocompleteChoiceType.php b/src/Form/Type/TemplateBlockAutocompleteChoiceType.php index c07373193..121bf2346 100644 --- a/src/Form/Type/TemplateBlockAutocompleteChoiceType.php +++ b/src/Form/Type/TemplateBlockAutocompleteChoiceType.php @@ -1,19 +1,13 @@ add('name', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.name', + 'label' => 'sylius_cms.ui.name', ]) ->add('type', ChoiceType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.type', + 'label' => 'sylius_cms.ui.type', 'choices' => [ - 'bitbag_sylius_cms_plugin.ui.page' => 'page', - 'bitbag_sylius_cms_plugin.ui.block' => 'block', + 'sylius_cms.ui.page' => 'page', + 'sylius_cms.ui.block' => 'block', ], ]) ->add('contentElements', CollectionType::class, [ @@ -44,6 +38,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_template'; + return 'sylius_cms_template'; } } diff --git a/src/Form/Type/Translation/MediaTranslationType.php b/src/Form/Type/Translation/MediaTranslationType.php index 5df403306..1dc707d04 100755 --- a/src/Form/Type/Translation/MediaTranslationType.php +++ b/src/Form/Type/Translation/MediaTranslationType.php @@ -1,17 +1,11 @@ add('alt', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.alt', + 'label' => 'sylius_cms.ui.alt', 'required' => false, ]) ->add('link', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.link', + 'label' => 'sylius_cms.ui.link', 'required' => false, ]) ->add('content', WysiwygType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.link_content', + 'label' => 'sylius_cms.ui.link_content', 'required' => false, ]) ; @@ -37,6 +31,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_media_translation'; + return 'sylius_cms_media_translation'; } } diff --git a/src/Form/Type/Translation/PageTranslationType.php b/src/Form/Type/Translation/PageTranslationType.php index e23c84e44..fbd264562 100755 --- a/src/Form/Type/Translation/PageTranslationType.php +++ b/src/Form/Type/Translation/PageTranslationType.php @@ -1,16 +1,12 @@ add('slug', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.slug', + 'label' => 'sylius_cms.ui.slug', ]) ->add('title', TextType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.meta_title', + 'label' => 'sylius_cms.ui.meta_title', 'required' => false, ]) ->add('metaKeywords', TextareaType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.meta_keywords', + 'label' => 'sylius_cms.ui.meta_keywords', 'required' => false, ]) ->add('metaDescription', TextareaType::class, [ - 'label' => 'bitbag_sylius_cms_plugin.ui.meta_description', + 'label' => 'sylius_cms.ui.meta_description', + 'required' => false, + ]) + ->add('teaserTitle', TextType::class, [ + 'label' => 'sylius_cms.ui.teaser.title', + 'required' => false, + ]) + ->add('teaserContent', WysiwygType::class, [ + 'label' => 'sylius_cms.ui.teaser.content', + 'required' => false, + ]) + ->add('teaserImage', MediaImageAutocompleteChoiceType::class, [ + 'label' => 'sylius_cms.ui.teaser.image', 'required' => false, ]) ; @@ -40,6 +48,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void public function getBlockPrefix(): string { - return 'bitbag_sylius_cms_plugin_page_translation'; + return 'sylius_cms_page_translation'; } } diff --git a/src/Form/Type/WysiwygType.php b/src/Form/Type/WysiwygType.php index 6318c3d0a..d11c662aa 100644 --- a/src/Form/Type/WysiwygType.php +++ b/src/Form/Type/WysiwygType.php @@ -1,14 +1,8 @@ setDefaults([ - 'label' => 'bitbag_sylius_cms_plugin.ui.content', + 'label' => 'sylius_cms.ui.content', 'config' => [ - 'filebrowserUploadUrl' => $this->urlGenerator->generate('bitbag_sylius_cms_plugin_admin_upload_editor_image'), - 'bodyId' => 'bitbag-ckeditor', + 'filebrowserUploadUrl' => $this->urlGenerator->generate('sylius_cms_admin_upload_editor_image'), + 'bodyId' => 'cms-ckeditor', ], ]); } @@ -39,6 +33,6 @@ public function getParent(): string public function getBlockPrefix(): string { - return 'bitbag_wysiwyg'; + return 'sylius_wysiwyg'; } } diff --git a/src/Importer/AbstractImporter.php b/src/Importer/AbstractImporter.php index 52147a013..e053006b8 100755 --- a/src/Importer/AbstractImporter.php +++ b/src/Importer/AbstractImporter.php @@ -1,14 +1,8 @@ importerCollectionsResolver->resolve($block, $this->getColumnValue(self::COLLECTIONS_COLUMN, $row)); $this->importerChannelsResolver->resolve($block, $this->getColumnValue(self::CHANNELS_COLUMN, $row)); - $this->importerLocalesResolver->resolve($block, $this->getColumnValue(self::LOCALES_COLUMN, $row)); $this->importerProductsResolver->resolve($block, $this->getColumnValue(self::PRODUCTS_COLUMN, $row)); $this->importerTaxonsResolver->resolve($block, $this->getColumnValue(self::TAXONS_COLUMN, $row)); $this->importerProductsInTaxonsResolver->resolve($block, $this->getColumnValue(self::PRODUCTS_IN_TAXONS_COLUMN, $row)); - $this->validateResource($block, ['bitbag']); + $this->validateResource($block, ['cms']); $this->blockRepository->add($block); } diff --git a/src/Importer/BlockImporterInterface.php b/src/Importer/BlockImporterInterface.php index fce4522af..a22b25457 100644 --- a/src/Importer/BlockImporterInterface.php +++ b/src/Importer/BlockImporterInterface.php @@ -1,14 +1,8 @@ getColumnValue(self::CODE_COLUMN, $row); + Assert::notNull($code); + /** @var BlockInterface $block */ + $block = $this->blockResourceResolver->getResource($code); + $block->setCode($code); + + $this->importerCollectionsResolver->resolve($block, $this->getColumnValue(self::SECTIONS_COLUMN, $row)); + $this->importerChannelsResolver->resolve($block, $this->getColumnValue(self::CHANNELS_COLUMN, $row)); + + $translationArray = $this->getAvailableLocales($this->getTranslatableColumns(), array_keys($row)); + foreach ($translationArray as $key => $locale) { + if ($key === array_key_first($translationArray)) { + $block->setName($this->getTranslatableColumnValue(self::NAME_COLUMN, $locale, $row)); + } + + $heading = ContentElementFactory::createHeadingContentElement( + $locale, + 'h2', + $this->getTranslatableColumnValue(self::NAME_COLUMN, $locale, $row), + ); + if ($heading) { + $heading->setBlock($block); + $block->addContentElement($heading); + } + + $singleMedia = ContentElementFactory::createSingleMediaContentElement( + $locale, + $this->getTranslatableColumnValue(self::IMAGE_COLUMN, $locale, $row), + ); + if ($singleMedia) { + $singleMedia->setBlock($block); + $block->addContentElement($singleMedia); + } + + $content = ContentElementFactory::createTextareaContentElement( + $locale, + $this->getTranslatableColumnValue(self::CONTENT_COLUMN, $locale, $row), + ); + if ($content) { + $content->setBlock($block); + $block->addContentElement($content); + } + } + + $locales = $this->localeRepository->findAll(); + /** @var LocaleInterface $locale */ + foreach ($locales as $locale) { + $productsGrid = ContentElementFactory::createProductsGridContentElement( + $locale->getCode(), + $this->getColumnValue(self::PRODUCTS_COLUMN, $row), + ); + if ($productsGrid) { + $productsGrid->setBlock($block); + $block->addContentElement($productsGrid); + } + } + + $this->validateResource($block, ['cms']); + $this->blockRepository->add($block); + } + + public function getResourceCode(): string + { + return 'block_legacy'; + } + + private function getTranslatableColumns(): array + { + return [ + self::NAME_COLUMN, + self::CONTENT_COLUMN, + self::IMAGE_COLUMN, + ]; + } +} diff --git a/src/Importer/Legacy/LegacyBlockImporterInterface.php b/src/Importer/Legacy/LegacyBlockImporterInterface.php new file mode 100644 index 000000000..182699840 --- /dev/null +++ b/src/Importer/Legacy/LegacyBlockImporterInterface.php @@ -0,0 +1,24 @@ +getColumnValue(self::CODE_COLUMN, $row); + Assert::notNull($code); + + /** @var PageInterface $page */ + $page = $this->pageResourceResolver->getResource($code); + + $page->setCode($code); + $page->setFallbackLocale($this->localeContext->getLocaleCode()); + + $this->importerCollectionsResolver->resolve($page, $this->getColumnValue(self::SECTIONS_COLUMN, $row)); + $this->importerChannelsResolver->resolve($page, $this->getColumnValue(self::CHANNELS_COLUMN, $row)); + + $translationArray = $this->getAvailableLocales($this->getTranslatableColumns(), array_keys($row)); + foreach ($translationArray as $key => $locale) { + $page->setCurrentLocale($locale); + $page->setSlug($this->getTranslatableColumnValue(self::SLUG_COLUMN, $locale, $row)); + $page->setMetaKeywords($this->getTranslatableColumnValue(self::META_KEYWORDS_COLUMN, $locale, $row)); + $page->setMetaDescription($this->getTranslatableColumnValue(self::META_DESCRIPTION_COLUMN, $locale, $row)); + + if ($key === array_key_first($translationArray)) { + $page->setName($this->getTranslatableColumnValue(self::NAME_COLUMN, $locale, $row)); + } + + $page->setTeaserTitle($this->getTranslatableColumnValue(self::NAME_WHEN_LINKED_COLUMN, $locale, $row)); + $page->setTeaserContent($this->getTranslatableColumnValue(self::DESCRIPTION_WHEN_LINKED_COLUMN, $locale, $row)); + + $heading = ContentElementFactory::createHeadingContentElement( + $locale, + 'h2', + $this->getTranslatableColumnValue(self::NAME_COLUMN, $locale, $row), + ); + if ($heading) { + $heading->setPage($page); + $page->addContentElement($heading); + } + + $singleMedia = ContentElementFactory::createSingleMediaContentElement( + $locale, + $this->getTranslatableColumnValue(self::IMAGE_COLUMN, $locale, $row), + ); + if ($singleMedia) { + $singleMedia->setPage($page); + $page->addContentElement($singleMedia); + } + + $content = ContentElementFactory::createTextareaContentElement( + $locale, + $this->getTranslatableColumnValue(self::CONTENT_COLUMN, $locale, $row), + ); + if ($content) { + $content->setPage($page); + $page->addContentElement($content); + } + } + + $locales = $this->localeRepository->findAll(); + /** @var LocaleInterface $locale */ + foreach ($locales as $locale) { + $productsGrid = ContentElementFactory::createProductsGridContentElement( + $locale->getCode(), + $this->getColumnValue(self::PRODUCTS_COLUMN, $row), + ); + if ($productsGrid) { + $productsGrid->setPage($page); + $page->addContentElement($productsGrid); + } + } + + $this->validateResource($page, ['cms']); + + $this->entityManager->persist($page); + $this->entityManager->flush(); + } + + public function getResourceCode(): string + { + return 'page_legacy'; + } + + private function getTranslatableColumns(): array + { + return [ + self::SLUG_COLUMN, + self::NAME_COLUMN, + self::IMAGE_COLUMN, + self::CONTENT_COLUMN, + self::META_KEYWORDS_COLUMN, + self::META_DESCRIPTION_COLUMN, + self::NAME_WHEN_LINKED_COLUMN, + self::DESCRIPTION_WHEN_LINKED_COLUMN, + ]; + } +} diff --git a/src/Importer/Legacy/LegacyPageImporterInterface.php b/src/Importer/Legacy/LegacyPageImporterInterface.php new file mode 100644 index 000000000..bc6e980f4 --- /dev/null +++ b/src/Importer/Legacy/LegacyPageImporterInterface.php @@ -0,0 +1,34 @@ +importerCollectionsResolver->resolve($media, $this->getColumnValue(self::COLLECTIONS_COLUMN, $row)); - $this->validateResource($media, ['bitbag']); + $this->validateResource($media, ['cms']); $this->mediaRepository->add($media); } diff --git a/src/Importer/MediaImporterInterface.php b/src/Importer/MediaImporterInterface.php index 2d20980f5..79872ea4f 100644 --- a/src/Importer/MediaImporterInterface.php +++ b/src/Importer/MediaImporterInterface.php @@ -1,14 +1,8 @@ importerCollectionsResolver->resolve($page, $this->getColumnValue(self::COLLECTIONS_COLUMN, $row)); $this->importerChannelsResolver->resolve($page, $this->getColumnValue(self::CHANNELS_COLUMN, $row)); - $this->validateResource($page, ['bitbag']); + $this->validateResource($page, ['cms']); $this->entityManager->persist($page); $this->entityManager->flush(); diff --git a/src/Importer/PageImporterInterface.php b/src/Importer/PageImporterInterface.php index ec3da1320..ae6eaa795 100644 --- a/src/Importer/PageImporterInterface.php +++ b/src/Importer/PageImporterInterface.php @@ -1,14 +1,8 @@ getMenu(); $cmsRootMenuItem = $menu - ->addChild('bitbag_cms') - ->setLabel('bitbag_sylius_cms_plugin.ui.cms') + ->addChild('sylius_cms') + ->setLabel('sylius_cms.ui.cms') ; $cmsRootMenuItem ->addChild('collections', [ - 'route' => 'bitbag_sylius_cms_plugin_admin_collection_index', + 'route' => 'sylius_cms_admin_collection_index', ]) - ->setLabel('bitbag_sylius_cms_plugin.ui.collections') + ->setLabel('sylius_cms.ui.collections') ->setLabelAttribute('icon', 'grid layout') ; $cmsRootMenuItem ->addChild('templates', [ - 'route' => 'bitbag_sylius_cms_plugin_admin_template_index', + 'route' => 'sylius_cms_admin_template_index', ]) - ->setLabel('bitbag_sylius_cms_plugin.ui.templates') + ->setLabel('sylius_cms.ui.templates') ->setLabelAttribute('icon', 'clone') ; $cmsRootMenuItem ->addChild('pages', [ - 'route' => 'bitbag_sylius_cms_plugin_admin_page_index', + 'route' => 'sylius_cms_admin_page_index', ]) - ->setLabel('bitbag_sylius_cms_plugin.ui.pages') + ->setLabel('sylius_cms.ui.pages') ->setLabelAttribute('icon', 'sticky note') ; $cmsRootMenuItem ->addChild('blocks', [ - 'route' => 'bitbag_sylius_cms_plugin_admin_block_index', + 'route' => 'sylius_cms_admin_block_index', ]) - ->setLabel('bitbag_sylius_cms_plugin.ui.blocks') + ->setLabel('sylius_cms.ui.blocks') ->setLabelAttribute('icon', 'block layout') ; $cmsRootMenuItem ->addChild('media', [ - 'route' => 'bitbag_sylius_cms_plugin_admin_media_index', + 'route' => 'sylius_cms_admin_media_index', ]) - ->setLabel('bitbag_sylius_cms_plugin.ui.media') + ->setLabel('sylius_cms.ui.media') ->setLabelAttribute('icon', 'file') ; - $this->menuReorder->reorder($menu, 'bitbag_cms', 'marketing'); + $this->menuReorder->reorder($menu, 'sylius_cms', 'marketing'); } } diff --git a/src/Menu/MenuReorder.php b/src/Menu/MenuReorder.php index 283d37028..a57fa8c94 100644 --- a/src/Menu/MenuReorder.php +++ b/src/Menu/MenuReorder.php @@ -1,14 +1,8 @@ addSql('ALTER TABLE bitbag_cms_block_taxons DROP FOREIGN KEY FK_E324C6CEDE13F470'); + $this->addSql('ALTER TABLE bitbag_cms_block_taxons DROP FOREIGN KEY FK_E324C6CEE9ED820C'); + $this->addSql('ALTER TABLE bitbag_cms_faq_translation DROP FOREIGN KEY FK_8B30DD2E2C2AC5D3'); + $this->addSql('ALTER TABLE bitbag_cms_page_channels DROP FOREIGN KEY FK_DCA426972F5A1AA'); + $this->addSql('ALTER TABLE bitbag_cms_page_channels DROP FOREIGN KEY FK_DCA4269C4663E4'); + $this->addSql('ALTER TABLE bitbag_cms_block_channels DROP FOREIGN KEY FK_8417B07372F5A1AA'); + $this->addSql('ALTER TABLE bitbag_cms_block_channels DROP FOREIGN KEY FK_8417B073E9ED820C'); + $this->addSql('ALTER TABLE bitbag_cms_block_products_in_taxons DROP FOREIGN KEY FK_DAA9DD18E9ED820C'); + $this->addSql('ALTER TABLE bitbag_cms_block_products_in_taxons DROP FOREIGN KEY FK_DAA9DD18DE13F470'); + $this->addSql('ALTER TABLE bitbag_cms_media_products DROP FOREIGN KEY FK_91A7DAC24584665A'); + $this->addSql('ALTER TABLE bitbag_cms_media_products DROP FOREIGN KEY FK_91A7DAC2EA9FDD75'); + $this->addSql('ALTER TABLE bitbag_cms_section_pages DROP FOREIGN KEY FK_C96225EEC4663E4'); + $this->addSql('ALTER TABLE bitbag_cms_section_pages DROP FOREIGN KEY FK_C96225EED823E37A'); + $this->addSql('ALTER TABLE bitbag_cms_media_translation DROP FOREIGN KEY FK_1FEC58972C2AC5D3'); + $this->addSql('ALTER TABLE bitbag_cms_page_translation DROP FOREIGN KEY FK_FDD074A62C2AC5D3'); + $this->addSql('ALTER TABLE bitbag_cms_section_blocks DROP FOREIGN KEY FK_A9D9C974D823E37A'); + $this->addSql('ALTER TABLE bitbag_cms_section_blocks DROP FOREIGN KEY FK_A9D9C974E9ED820C'); + $this->addSql('ALTER TABLE bitbag_cms_block_products DROP FOREIGN KEY FK_C4B9089F4584665A'); + $this->addSql('ALTER TABLE bitbag_cms_block_products DROP FOREIGN KEY FK_C4B9089FE9ED820C'); + $this->addSql('ALTER TABLE bitbag_cms_page DROP FOREIGN KEY FK_18F07F1BF56F16CF'); + $this->addSql('ALTER TABLE bitbag_cms_block_locales DROP FOREIGN KEY FK_E1F907BAE559DFD1'); + $this->addSql('ALTER TABLE bitbag_cms_block_locales DROP FOREIGN KEY FK_E1F907BAE9ED820C'); + $this->addSql('ALTER TABLE bitbag_cms_section_media DROP FOREIGN KEY FK_833A6197D823E37A'); + $this->addSql('ALTER TABLE bitbag_cms_section_media DROP FOREIGN KEY FK_833A6197EA9FDD75'); + $this->addSql('ALTER TABLE bitbag_cms_content_configuration DROP FOREIGN KEY FK_D899EFA7E9ED820C'); + $this->addSql('ALTER TABLE bitbag_cms_content_configuration DROP FOREIGN KEY FK_D899EFA7C4663E4'); + $this->addSql('ALTER TABLE bitbag_cms_media_channels DROP FOREIGN KEY FK_D109622E72F5A1AA'); + $this->addSql('ALTER TABLE bitbag_cms_media_channels DROP FOREIGN KEY FK_D109622EEA9FDD75'); + $this->addSql('ALTER TABLE bitbag_cms_faq_channels DROP FOREIGN KEY FK_FF6D59AC72F5A1AA'); + $this->addSql('ALTER TABLE bitbag_cms_faq_channels DROP FOREIGN KEY FK_FF6D59AC81BEC8C2'); + + $this->addSql('RENAME TABLE bitbag_cms_template TO sylius_cms_template'); + $this->addSql('RENAME TABLE bitbag_cms_media TO sylius_cms_media'); + $this->addSql('RENAME TABLE bitbag_cms_block TO sylius_cms_block'); + $this->addSql('RENAME TABLE bitbag_cms_block_taxons TO sylius_cms_block_taxons'); + $this->addSql('RENAME TABLE bitbag_cms_page_channels TO sylius_cms_page_channels'); + $this->addSql('RENAME TABLE bitbag_cms_block_channels TO sylius_cms_block_channels'); + $this->addSql('RENAME TABLE bitbag_cms_block_products_in_taxons TO sylius_cms_block_products_in_taxons'); + $this->addSql('RENAME TABLE bitbag_cms_section_pages TO sylius_cms_section_pages'); + $this->addSql('RENAME TABLE bitbag_cms_media_translation TO sylius_cms_media_translation'); + $this->addSql('RENAME TABLE bitbag_cms_page_translation TO sylius_cms_page_translation'); + $this->addSql('RENAME TABLE bitbag_cms_section_blocks TO sylius_cms_section_blocks'); + $this->addSql('RENAME TABLE bitbag_cms_block_products TO sylius_cms_block_products'); + $this->addSql('RENAME TABLE bitbag_cms_page TO sylius_cms_page'); + $this->addSql('RENAME TABLE bitbag_cms_section TO sylius_cms_section'); + $this->addSql('RENAME TABLE bitbag_cms_block_locales TO sylius_cms_block_locales'); + $this->addSql('RENAME TABLE bitbag_cms_section_media TO sylius_cms_section_media'); + $this->addSql('RENAME TABLE bitbag_cms_content_configuration TO sylius_cms_content_configuration'); + $this->addSql('RENAME TABLE bitbag_cms_media_channels TO sylius_cms_media_channels'); + + $this->addSql('ALTER TABLE sylius_cms_block_channels ADD CONSTRAINT FK_7026602FE9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_channels ADD CONSTRAINT FK_7026602F72F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_locales ADD CONSTRAINT FK_49C0AACE9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_locales ADD CONSTRAINT FK_49C0AACE559DFD1 FOREIGN KEY (locale_id) REFERENCES sylius_locale (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_products ADD CONSTRAINT FK_3088D8C3E9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_products ADD CONSTRAINT FK_3088D8C34584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_taxons ADD CONSTRAINT FK_5397DD03E9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_taxons ADD CONSTRAINT FK_5397DD03DE13F470 FOREIGN KEY (taxon_id) REFERENCES sylius_taxon (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_products_in_taxons ADD CONSTRAINT FK_B4D0B7CEE9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_products_in_taxons ADD CONSTRAINT FK_B4D0B7CEDE13F470 FOREIGN KEY (taxon_id) REFERENCES sylius_taxon (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_content_configuration ADD CONSTRAINT FK_BB97608DE9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id)'); + $this->addSql('ALTER TABLE sylius_cms_content_configuration ADD CONSTRAINT FK_BB97608DC4663E4 FOREIGN KEY (page_id) REFERENCES sylius_cms_page (id)'); + $this->addSql('ALTER TABLE sylius_cms_media_channels ADD CONSTRAINT FK_2538B272EA9FDD75 FOREIGN KEY (media_id) REFERENCES sylius_cms_media (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_media_channels ADD CONSTRAINT FK_2538B27272F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_media_translation ADD CONSTRAINT FK_AAAC4A922C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_cms_media (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_page ADD CONSTRAINT FK_2C2740B2F56F16CF FOREIGN KEY (teaser_image_id) REFERENCES sylius_cms_media (id) ON DELETE SET NULL'); + $this->addSql('ALTER TABLE sylius_cms_page_channels ADD CONSTRAINT FK_E8AF4F7FC4663E4 FOREIGN KEY (page_id) REFERENCES sylius_cms_page (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_page_channels ADD CONSTRAINT FK_E8AF4F7F72F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_page_translation ADD CONSTRAINT FK_6D0D401B2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_cms_page (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_pages ADD CONSTRAINT FK_2C0728F8D823E37A FOREIGN KEY (section_id) REFERENCES sylius_cms_section (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_pages ADD CONSTRAINT FK_2C0728F8C4663E4 FOREIGN KEY (page_id) REFERENCES sylius_cms_page (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_blocks ADD CONSTRAINT FK_5DE81928D823E37A FOREIGN KEY (section_id) REFERENCES sylius_cms_section (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_blocks ADD CONSTRAINT FK_5DE81928E9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_media ADD CONSTRAINT FK_665F6C81D823E37A FOREIGN KEY (section_id) REFERENCES sylius_cms_section (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_media ADD CONSTRAINT FK_665F6C81EA9FDD75 FOREIGN KEY (media_id) REFERENCES sylius_cms_media (id) ON DELETE CASCADE'); + + $this->addSql('DROP TABLE bitbag_cms_faq_translation'); + $this->addSql('DROP TABLE bitbag_cms_media_products'); + $this->addSql('DROP TABLE bitbag_cms_faq'); + $this->addSql('DROP TABLE bitbag_cms_faq_channels'); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE sylius_cms_block_channels DROP FOREIGN KEY FK_7026602FE9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_block_channels DROP FOREIGN KEY FK_7026602F72F5A1AA'); + $this->addSql('ALTER TABLE sylius_cms_block_locales DROP FOREIGN KEY FK_49C0AACE9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_block_locales DROP FOREIGN KEY FK_49C0AACE559DFD1'); + $this->addSql('ALTER TABLE sylius_cms_block_products DROP FOREIGN KEY FK_3088D8C3E9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_block_products DROP FOREIGN KEY FK_3088D8C34584665A'); + $this->addSql('ALTER TABLE sylius_cms_block_taxons DROP FOREIGN KEY FK_5397DD03E9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_block_taxons DROP FOREIGN KEY FK_5397DD03DE13F470'); + $this->addSql('ALTER TABLE sylius_cms_block_products_in_taxons DROP FOREIGN KEY FK_B4D0B7CEE9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_block_products_in_taxons DROP FOREIGN KEY FK_B4D0B7CEDE13F470'); + $this->addSql('ALTER TABLE sylius_cms_content_configuration DROP FOREIGN KEY FK_BB97608DE9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_content_configuration DROP FOREIGN KEY FK_BB97608DC4663E4'); + $this->addSql('ALTER TABLE sylius_cms_media_channels DROP FOREIGN KEY FK_2538B272EA9FDD75'); + $this->addSql('ALTER TABLE sylius_cms_media_channels DROP FOREIGN KEY FK_2538B27272F5A1AA'); + $this->addSql('ALTER TABLE sylius_cms_media_translation DROP FOREIGN KEY FK_AAAC4A922C2AC5D3'); + $this->addSql('ALTER TABLE sylius_cms_page DROP FOREIGN KEY FK_2C2740B2F56F16CF'); + $this->addSql('ALTER TABLE sylius_cms_page_channels DROP FOREIGN KEY FK_E8AF4F7FC4663E4'); + $this->addSql('ALTER TABLE sylius_cms_page_channels DROP FOREIGN KEY FK_E8AF4F7F72F5A1AA'); + $this->addSql('ALTER TABLE sylius_cms_page_translation DROP FOREIGN KEY FK_6D0D401B2C2AC5D3'); + $this->addSql('ALTER TABLE sylius_cms_section_pages DROP FOREIGN KEY FK_2C0728F8D823E37A'); + $this->addSql('ALTER TABLE sylius_cms_section_pages DROP FOREIGN KEY FK_2C0728F8C4663E4'); + $this->addSql('ALTER TABLE sylius_cms_section_blocks DROP FOREIGN KEY FK_5DE81928D823E37A'); + $this->addSql('ALTER TABLE sylius_cms_section_blocks DROP FOREIGN KEY FK_5DE81928E9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_section_media DROP FOREIGN KEY FK_665F6C81D823E37A'); + $this->addSql('ALTER TABLE sylius_cms_section_media DROP FOREIGN KEY FK_665F6C81EA9FDD75'); + + $this->addSql('RENAME TABLE sylius_cms_template TO bitbag_cms_template'); + $this->addSql('RENAME TABLE sylius_cms_media TO bitbag_cms_media'); + $this->addSql('RENAME TABLE sylius_cms_block TO bitbag_cms_block'); + $this->addSql('RENAME TABLE sylius_cms_block_taxons TO bitbag_cms_block_taxons'); + $this->addSql('RENAME TABLE sylius_cms_page_channels TO bitbag_cms_page_channels'); + $this->addSql('RENAME TABLE sylius_cms_block_channels TO bitbag_cms_block_channels'); + $this->addSql('RENAME TABLE sylius_cms_block_products_in_taxons TO bitbag_cms_block_products_in_taxons'); + $this->addSql('RENAME TABLE sylius_cms_section_pages TO bitbag_cms_section_pages'); + $this->addSql('RENAME TABLE sylius_cms_media_translation TO bitbag_cms_media_translation'); + $this->addSql('RENAME TABLE sylius_cms_page_translation TO bitbag_cms_page_translation'); + $this->addSql('RENAME TABLE sylius_cms_section_blocks TO bitbag_cms_section_blocks'); + $this->addSql('RENAME TABLE sylius_cms_block_products TO bitbag_cms_block_products'); + $this->addSql('RENAME TABLE sylius_cms_page TO bitbag_cms_page'); + $this->addSql('RENAME TABLE sylius_cms_section TO bitbag_cms_section'); + $this->addSql('RENAME TABLE sylius_cms_block_locales TO bitbag_cms_block_locales'); + $this->addSql('RENAME TABLE sylius_cms_section_media TO bitbag_cms_section_media'); + $this->addSql('RENAME TABLE sylius_cms_content_configuration TO bitbag_cms_content_configuration'); + $this->addSql('RENAME TABLE sylius_cms_media_channels TO bitbag_cms_media_channels'); + + $this->addSql('ALTER TABLE bitbag_cms_block_taxons ADD CONSTRAINT FK_E324C6CEDE13F470 FOREIGN KEY (taxon_id) REFERENCES sylius_taxon (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_block_taxons ADD CONSTRAINT FK_E324C6CEE9ED820C FOREIGN KEY (block_id) REFERENCES bitbag_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_page_channels ADD CONSTRAINT FK_DCA426972F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_page_channels ADD CONSTRAINT FK_DCA4269C4663E4 FOREIGN KEY (page_id) REFERENCES bitbag_cms_page (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_block_channels ADD CONSTRAINT FK_8417B07372F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_block_channels ADD CONSTRAINT FK_8417B073E9ED820C FOREIGN KEY (block_id) REFERENCES bitbag_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_block_products_in_taxons ADD CONSTRAINT FK_DAA9DD18E9ED820C FOREIGN KEY (block_id) REFERENCES bitbag_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_block_products_in_taxons ADD CONSTRAINT FK_DAA9DD18DE13F470 FOREIGN KEY (taxon_id) REFERENCES sylius_taxon (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_section_pages ADD CONSTRAINT FK_C96225EEC4663E4 FOREIGN KEY (page_id) REFERENCES bitbag_cms_page (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_section_pages ADD CONSTRAINT FK_C96225EED823E37A FOREIGN KEY (section_id) REFERENCES bitbag_cms_section (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_media_translation ADD CONSTRAINT FK_1FEC58972C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES bitbag_cms_media (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_page_translation ADD CONSTRAINT FK_FDD074A62C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES bitbag_cms_page (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_section_blocks ADD CONSTRAINT FK_A9D9C974D823E37A FOREIGN KEY (section_id) REFERENCES bitbag_cms_section (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_section_blocks ADD CONSTRAINT FK_A9D9C974E9ED820C FOREIGN KEY (block_id) REFERENCES bitbag_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_block_products ADD CONSTRAINT FK_C4B9089F4584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_block_products ADD CONSTRAINT FK_C4B9089FE9ED820C FOREIGN KEY (block_id) REFERENCES bitbag_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_page ADD CONSTRAINT FK_18F07F1BF56F16CF FOREIGN KEY (teaser_image_id) REFERENCES bitbag_cms_media (id) ON DELETE SET NULL'); + $this->addSql('ALTER TABLE bitbag_cms_block_locales ADD CONSTRAINT FK_E1F907BAE559DFD1 FOREIGN KEY (locale_id) REFERENCES sylius_locale (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_block_locales ADD CONSTRAINT FK_E1F907BAE9ED820C FOREIGN KEY (block_id) REFERENCES bitbag_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_section_media ADD CONSTRAINT FK_833A6197D823E37A FOREIGN KEY (section_id) REFERENCES bitbag_cms_section (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_section_media ADD CONSTRAINT FK_833A6197EA9FDD75 FOREIGN KEY (media_id) REFERENCES bitbag_cms_media (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_content_configuration ADD CONSTRAINT FK_D899EFA7E9ED820C FOREIGN KEY (block_id) REFERENCES bitbag_cms_block (id)'); + $this->addSql('ALTER TABLE bitbag_cms_content_configuration ADD CONSTRAINT FK_D899EFA7C4663E4 FOREIGN KEY (page_id) REFERENCES bitbag_cms_page (id)'); + $this->addSql('ALTER TABLE bitbag_cms_media_channels ADD CONSTRAINT FK_D109622E72F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_media_channels ADD CONSTRAINT FK_D109622EEA9FDD75 FOREIGN KEY (media_id) REFERENCES bitbag_cms_media (id) ON DELETE CASCADE'); + + $this->addSql('CREATE TABLE bitbag_cms_faq_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, question LONGTEXT CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`, answer LONGTEXT CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`, locale VARCHAR(255) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`, INDEX IDX_8B30DD2E2C2AC5D3 (translatable_id), UNIQUE INDEX bitbag_cms_faq_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB COMMENT = \'\' '); + $this->addSql('CREATE TABLE bitbag_cms_media_products (media_id INT NOT NULL, product_id INT NOT NULL, INDEX IDX_91A7DAC2EA9FDD75 (media_id), INDEX IDX_91A7DAC24584665A (product_id), PRIMARY KEY(media_id, product_id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB COMMENT = \'\' '); + $this->addSql('CREATE TABLE bitbag_cms_faq (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(255) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`, position INT NOT NULL, enabled TINYINT(1) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB COMMENT = \'\' '); + $this->addSql('CREATE TABLE bitbag_cms_faq_channels (faq_id INT NOT NULL, channel_id INT NOT NULL, INDEX IDX_FF6D59AC81BEC8C2 (faq_id), INDEX IDX_FF6D59AC72F5A1AA (channel_id), PRIMARY KEY(faq_id, channel_id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB COMMENT = \'\' '); + + $this->addSql('ALTER TABLE bitbag_cms_faq_translation ADD CONSTRAINT FK_8B30DD2E2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES bitbag_cms_faq (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_media_products ADD CONSTRAINT FK_91A7DAC24584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_media_products ADD CONSTRAINT FK_91A7DAC2EA9FDD75 FOREIGN KEY (media_id) REFERENCES bitbag_cms_media (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_faq_channels ADD CONSTRAINT FK_FF6D59AC72F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE bitbag_cms_faq_channels ADD CONSTRAINT FK_FF6D59AC81BEC8C2 FOREIGN KEY (faq_id) REFERENCES bitbag_cms_faq (id) ON DELETE CASCADE'); + } +} diff --git a/src/Migrations/Version20240903103926.php b/src/Migrations/Version20240903103926.php new file mode 100644 index 000000000..5b466df32 --- /dev/null +++ b/src/Migrations/Version20240903103926.php @@ -0,0 +1,252 @@ +addSql('DROP INDEX uniq_321c84cf77153098 ON sylius_cms_block'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_9D2248BC77153098 ON sylius_cms_block (code)'); + $this->addSql('ALTER TABLE sylius_cms_block_channels DROP FOREIGN KEY FK_7026602F72F5A1AA'); + $this->addSql('ALTER TABLE sylius_cms_block_channels DROP FOREIGN KEY FK_7026602FE9ED820C'); + $this->addSql('DROP INDEX idx_8417b073e9ed820c ON sylius_cms_block_channels'); + $this->addSql('CREATE INDEX IDX_7026602FE9ED820C ON sylius_cms_block_channels (block_id)'); + $this->addSql('DROP INDEX idx_8417b07372f5a1aa ON sylius_cms_block_channels'); + $this->addSql('CREATE INDEX IDX_7026602F72F5A1AA ON sylius_cms_block_channels (channel_id)'); + $this->addSql('ALTER TABLE sylius_cms_block_channels ADD CONSTRAINT FK_7026602F72F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_channels ADD CONSTRAINT FK_7026602FE9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_locales DROP FOREIGN KEY FK_49C0AACE559DFD1'); + $this->addSql('ALTER TABLE sylius_cms_block_locales DROP FOREIGN KEY FK_49C0AACE9ED820C'); + $this->addSql('DROP INDEX idx_e1f907bae9ed820c ON sylius_cms_block_locales'); + $this->addSql('CREATE INDEX IDX_49C0AACE9ED820C ON sylius_cms_block_locales (block_id)'); + $this->addSql('DROP INDEX idx_e1f907bae559dfd1 ON sylius_cms_block_locales'); + $this->addSql('CREATE INDEX IDX_49C0AACE559DFD1 ON sylius_cms_block_locales (locale_id)'); + $this->addSql('ALTER TABLE sylius_cms_block_locales ADD CONSTRAINT FK_49C0AACE559DFD1 FOREIGN KEY (locale_id) REFERENCES sylius_locale (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_locales ADD CONSTRAINT FK_49C0AACE9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_products DROP FOREIGN KEY FK_3088D8C3E9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_block_products DROP FOREIGN KEY FK_3088D8C34584665A'); + $this->addSql('DROP INDEX idx_c4b9089fe9ed820c ON sylius_cms_block_products'); + $this->addSql('CREATE INDEX IDX_3088D8C3E9ED820C ON sylius_cms_block_products (block_id)'); + $this->addSql('DROP INDEX idx_c4b9089f4584665a ON sylius_cms_block_products'); + $this->addSql('CREATE INDEX IDX_3088D8C34584665A ON sylius_cms_block_products (product_id)'); + $this->addSql('ALTER TABLE sylius_cms_block_products ADD CONSTRAINT FK_3088D8C3E9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_products ADD CONSTRAINT FK_3088D8C34584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_taxons DROP FOREIGN KEY FK_5397DD03E9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_block_taxons DROP FOREIGN KEY FK_5397DD03DE13F470'); + $this->addSql('DROP INDEX idx_e324c6cee9ed820c ON sylius_cms_block_taxons'); + $this->addSql('CREATE INDEX IDX_5397DD03E9ED820C ON sylius_cms_block_taxons (block_id)'); + $this->addSql('DROP INDEX idx_e324c6cede13f470 ON sylius_cms_block_taxons'); + $this->addSql('CREATE INDEX IDX_5397DD03DE13F470 ON sylius_cms_block_taxons (taxon_id)'); + $this->addSql('ALTER TABLE sylius_cms_block_taxons ADD CONSTRAINT FK_5397DD03E9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_taxons ADD CONSTRAINT FK_5397DD03DE13F470 FOREIGN KEY (taxon_id) REFERENCES sylius_taxon (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_products_in_taxons DROP FOREIGN KEY FK_B4D0B7CEDE13F470'); + $this->addSql('ALTER TABLE sylius_cms_block_products_in_taxons DROP FOREIGN KEY FK_B4D0B7CEE9ED820C'); + $this->addSql('DROP INDEX idx_daa9dd18e9ed820c ON sylius_cms_block_products_in_taxons'); + $this->addSql('CREATE INDEX IDX_B4D0B7CEE9ED820C ON sylius_cms_block_products_in_taxons (block_id)'); + $this->addSql('DROP INDEX idx_daa9dd18de13f470 ON sylius_cms_block_products_in_taxons'); + $this->addSql('CREATE INDEX IDX_B4D0B7CEDE13F470 ON sylius_cms_block_products_in_taxons (taxon_id)'); + $this->addSql('ALTER TABLE sylius_cms_block_products_in_taxons ADD CONSTRAINT FK_B4D0B7CEDE13F470 FOREIGN KEY (taxon_id) REFERENCES sylius_taxon (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_products_in_taxons ADD CONSTRAINT FK_B4D0B7CEE9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_content_configuration DROP FOREIGN KEY FK_BB97608DC4663E4'); + $this->addSql('ALTER TABLE sylius_cms_content_configuration DROP FOREIGN KEY FK_BB97608DE9ED820C'); + $this->addSql('DROP INDEX idx_d899efa7e9ed820c ON sylius_cms_content_configuration'); + $this->addSql('CREATE INDEX IDX_BB97608DE9ED820C ON sylius_cms_content_configuration (block_id)'); + $this->addSql('DROP INDEX idx_d899efa7c4663e4 ON sylius_cms_content_configuration'); + $this->addSql('CREATE INDEX IDX_BB97608DC4663E4 ON sylius_cms_content_configuration (page_id)'); + $this->addSql('ALTER TABLE sylius_cms_content_configuration ADD CONSTRAINT FK_BB97608DC4663E4 FOREIGN KEY (page_id) REFERENCES sylius_cms_page (id)'); + $this->addSql('ALTER TABLE sylius_cms_content_configuration ADD CONSTRAINT FK_BB97608DE9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id)'); + $this->addSql('DROP INDEX uniq_db2bb2e177153098 ON sylius_cms_media'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_74157E9277153098 ON sylius_cms_media (code)'); + $this->addSql('DROP INDEX uniq_db2bb2e1b548b0f ON sylius_cms_media'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_74157E92B548B0F ON sylius_cms_media (path)'); + $this->addSql('ALTER TABLE sylius_cms_media_channels DROP FOREIGN KEY FK_2538B27272F5A1AA'); + $this->addSql('ALTER TABLE sylius_cms_media_channels DROP FOREIGN KEY FK_2538B272EA9FDD75'); + $this->addSql('DROP INDEX idx_d109622eea9fdd75 ON sylius_cms_media_channels'); + $this->addSql('CREATE INDEX IDX_2538B272EA9FDD75 ON sylius_cms_media_channels (media_id)'); + $this->addSql('DROP INDEX idx_d109622e72f5a1aa ON sylius_cms_media_channels'); + $this->addSql('CREATE INDEX IDX_2538B27272F5A1AA ON sylius_cms_media_channels (channel_id)'); + $this->addSql('ALTER TABLE sylius_cms_media_channels ADD CONSTRAINT FK_2538B27272F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_media_channels ADD CONSTRAINT FK_2538B272EA9FDD75 FOREIGN KEY (media_id) REFERENCES sylius_cms_media (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_media_translation DROP FOREIGN KEY FK_AAAC4A922C2AC5D3'); + $this->addSql('DROP INDEX idx_1fec58972c2ac5d3 ON sylius_cms_media_translation'); + $this->addSql('CREATE INDEX IDX_AAAC4A922C2AC5D3 ON sylius_cms_media_translation (translatable_id)'); + $this->addSql('DROP INDEX bitbag_cms_media_translation_uniq_trans ON sylius_cms_media_translation'); + $this->addSql('CREATE UNIQUE INDEX sylius_cms_media_translation_uniq_trans ON sylius_cms_media_translation (translatable_id, locale)'); + $this->addSql('ALTER TABLE sylius_cms_media_translation ADD CONSTRAINT FK_AAAC4A922C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_cms_media (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_page DROP FOREIGN KEY FK_2C2740B2F56F16CF'); + $this->addSql('DROP INDEX uniq_18f07f1b77153098 ON sylius_cms_page'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_2C2740B277153098 ON sylius_cms_page (code)'); + $this->addSql('DROP INDEX idx_18f07f1bf56f16cf ON sylius_cms_page'); + $this->addSql('CREATE INDEX IDX_2C2740B2F56F16CF ON sylius_cms_page (teaser_image_id)'); + $this->addSql('ALTER TABLE sylius_cms_page ADD CONSTRAINT FK_2C2740B2F56F16CF FOREIGN KEY (teaser_image_id) REFERENCES sylius_cms_media (id) ON DELETE SET NULL'); + $this->addSql('ALTER TABLE sylius_cms_page_channels DROP FOREIGN KEY FK_E8AF4F7F72F5A1AA'); + $this->addSql('ALTER TABLE sylius_cms_page_channels DROP FOREIGN KEY FK_E8AF4F7FC4663E4'); + $this->addSql('DROP INDEX idx_dca4269c4663e4 ON sylius_cms_page_channels'); + $this->addSql('CREATE INDEX IDX_E8AF4F7FC4663E4 ON sylius_cms_page_channels (page_id)'); + $this->addSql('DROP INDEX idx_dca426972f5a1aa ON sylius_cms_page_channels'); + $this->addSql('CREATE INDEX IDX_E8AF4F7F72F5A1AA ON sylius_cms_page_channels (channel_id)'); + $this->addSql('ALTER TABLE sylius_cms_page_channels ADD CONSTRAINT FK_E8AF4F7F72F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_page_channels ADD CONSTRAINT FK_E8AF4F7FC4663E4 FOREIGN KEY (page_id) REFERENCES sylius_cms_page (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_page_translation DROP FOREIGN KEY FK_6D0D401B2C2AC5D3'); + $this->addSql('DROP INDEX idx_fdd074a62c2ac5d3 ON sylius_cms_page_translation'); + $this->addSql('CREATE INDEX IDX_6D0D401B2C2AC5D3 ON sylius_cms_page_translation (translatable_id)'); + $this->addSql('DROP INDEX bitbag_cms_page_translation_uniq_trans ON sylius_cms_page_translation'); + $this->addSql('CREATE UNIQUE INDEX sylius_cms_page_translation_uniq_trans ON sylius_cms_page_translation (translatable_id, locale)'); + $this->addSql('ALTER TABLE sylius_cms_page_translation ADD CONSTRAINT FK_6D0D401B2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_cms_page (id) ON DELETE CASCADE'); + $this->addSql('DROP INDEX uniq_421d079777153098 ON sylius_cms_section'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_D4DD0C0777153098 ON sylius_cms_section (code)'); + $this->addSql('ALTER TABLE sylius_cms_section_pages DROP FOREIGN KEY FK_2C0728F8D823E37A'); + $this->addSql('ALTER TABLE sylius_cms_section_pages DROP FOREIGN KEY FK_2C0728F8C4663E4'); + $this->addSql('DROP INDEX idx_c96225eed823e37a ON sylius_cms_section_pages'); + $this->addSql('CREATE INDEX IDX_2C0728F8D823E37A ON sylius_cms_section_pages (section_id)'); + $this->addSql('DROP INDEX idx_c96225eec4663e4 ON sylius_cms_section_pages'); + $this->addSql('CREATE INDEX IDX_2C0728F8C4663E4 ON sylius_cms_section_pages (page_id)'); + $this->addSql('ALTER TABLE sylius_cms_section_pages ADD CONSTRAINT FK_2C0728F8D823E37A FOREIGN KEY (section_id) REFERENCES sylius_cms_section (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_pages ADD CONSTRAINT FK_2C0728F8C4663E4 FOREIGN KEY (page_id) REFERENCES sylius_cms_page (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_blocks DROP FOREIGN KEY FK_5DE81928D823E37A'); + $this->addSql('ALTER TABLE sylius_cms_section_blocks DROP FOREIGN KEY FK_5DE81928E9ED820C'); + $this->addSql('DROP INDEX idx_a9d9c974d823e37a ON sylius_cms_section_blocks'); + $this->addSql('CREATE INDEX IDX_5DE81928D823E37A ON sylius_cms_section_blocks (section_id)'); + $this->addSql('DROP INDEX idx_a9d9c974e9ed820c ON sylius_cms_section_blocks'); + $this->addSql('CREATE INDEX IDX_5DE81928E9ED820C ON sylius_cms_section_blocks (block_id)'); + $this->addSql('ALTER TABLE sylius_cms_section_blocks ADD CONSTRAINT FK_5DE81928D823E37A FOREIGN KEY (section_id) REFERENCES sylius_cms_section (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_blocks ADD CONSTRAINT FK_5DE81928E9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_media DROP FOREIGN KEY FK_665F6C81EA9FDD75'); + $this->addSql('ALTER TABLE sylius_cms_section_media DROP FOREIGN KEY FK_665F6C81D823E37A'); + $this->addSql('DROP INDEX idx_833a6197d823e37a ON sylius_cms_section_media'); + $this->addSql('CREATE INDEX IDX_665F6C81D823E37A ON sylius_cms_section_media (section_id)'); + $this->addSql('DROP INDEX idx_833a6197ea9fdd75 ON sylius_cms_section_media'); + $this->addSql('CREATE INDEX IDX_665F6C81EA9FDD75 ON sylius_cms_section_media (media_id)'); + $this->addSql('ALTER TABLE sylius_cms_section_media ADD CONSTRAINT FK_665F6C81EA9FDD75 FOREIGN KEY (media_id) REFERENCES sylius_cms_media (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_media ADD CONSTRAINT FK_665F6C81D823E37A FOREIGN KEY (section_id) REFERENCES sylius_cms_section (id) ON DELETE CASCADE'); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE sylius_cms_block_products_in_taxons DROP FOREIGN KEY FK_B4D0B7CEE9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_block_products_in_taxons DROP FOREIGN KEY FK_B4D0B7CEDE13F470'); + $this->addSql('DROP INDEX idx_b4d0b7cee9ed820c ON sylius_cms_block_products_in_taxons'); + $this->addSql('CREATE INDEX IDX_DAA9DD18E9ED820C ON sylius_cms_block_products_in_taxons (block_id)'); + $this->addSql('DROP INDEX idx_b4d0b7cede13f470 ON sylius_cms_block_products_in_taxons'); + $this->addSql('CREATE INDEX IDX_DAA9DD18DE13F470 ON sylius_cms_block_products_in_taxons (taxon_id)'); + $this->addSql('ALTER TABLE sylius_cms_block_products_in_taxons ADD CONSTRAINT FK_B4D0B7CEE9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_products_in_taxons ADD CONSTRAINT FK_B4D0B7CEDE13F470 FOREIGN KEY (taxon_id) REFERENCES sylius_taxon (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_media_channels DROP FOREIGN KEY FK_2538B272EA9FDD75'); + $this->addSql('ALTER TABLE sylius_cms_media_channels DROP FOREIGN KEY FK_2538B27272F5A1AA'); + $this->addSql('DROP INDEX idx_2538b27272f5a1aa ON sylius_cms_media_channels'); + $this->addSql('CREATE INDEX IDX_D109622E72F5A1AA ON sylius_cms_media_channels (channel_id)'); + $this->addSql('DROP INDEX idx_2538b272ea9fdd75 ON sylius_cms_media_channels'); + $this->addSql('CREATE INDEX IDX_D109622EEA9FDD75 ON sylius_cms_media_channels (media_id)'); + $this->addSql('ALTER TABLE sylius_cms_media_channels ADD CONSTRAINT FK_2538B272EA9FDD75 FOREIGN KEY (media_id) REFERENCES sylius_cms_media (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_media_channels ADD CONSTRAINT FK_2538B27272F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_pages DROP FOREIGN KEY FK_2C0728F8D823E37A'); + $this->addSql('ALTER TABLE sylius_cms_section_pages DROP FOREIGN KEY FK_2C0728F8C4663E4'); + $this->addSql('DROP INDEX idx_2c0728f8d823e37a ON sylius_cms_section_pages'); + $this->addSql('CREATE INDEX IDX_C96225EED823E37A ON sylius_cms_section_pages (section_id)'); + $this->addSql('DROP INDEX idx_2c0728f8c4663e4 ON sylius_cms_section_pages'); + $this->addSql('CREATE INDEX IDX_C96225EEC4663E4 ON sylius_cms_section_pages (page_id)'); + $this->addSql('ALTER TABLE sylius_cms_section_pages ADD CONSTRAINT FK_2C0728F8D823E37A FOREIGN KEY (section_id) REFERENCES sylius_cms_section (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_pages ADD CONSTRAINT FK_2C0728F8C4663E4 FOREIGN KEY (page_id) REFERENCES sylius_cms_page (id) ON DELETE CASCADE'); + $this->addSql('DROP INDEX uniq_74157e9277153098 ON sylius_cms_media'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_DB2BB2E177153098 ON sylius_cms_media (code)'); + $this->addSql('DROP INDEX uniq_74157e92b548b0f ON sylius_cms_media'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_DB2BB2E1B548B0F ON sylius_cms_media (path)'); + $this->addSql('ALTER TABLE sylius_cms_page DROP FOREIGN KEY FK_2C2740B2F56F16CF'); + $this->addSql('DROP INDEX idx_2c2740b2f56f16cf ON sylius_cms_page'); + $this->addSql('CREATE INDEX IDX_18F07F1BF56F16CF ON sylius_cms_page (teaser_image_id)'); + $this->addSql('DROP INDEX uniq_2c2740b277153098 ON sylius_cms_page'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_18F07F1B77153098 ON sylius_cms_page (code)'); + $this->addSql('ALTER TABLE sylius_cms_page ADD CONSTRAINT FK_2C2740B2F56F16CF FOREIGN KEY (teaser_image_id) REFERENCES sylius_cms_media (id) ON DELETE SET NULL'); + $this->addSql('ALTER TABLE sylius_cms_block_channels DROP FOREIGN KEY FK_7026602FE9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_block_channels DROP FOREIGN KEY FK_7026602F72F5A1AA'); + $this->addSql('DROP INDEX idx_7026602f72f5a1aa ON sylius_cms_block_channels'); + $this->addSql('CREATE INDEX IDX_8417B07372F5A1AA ON sylius_cms_block_channels (channel_id)'); + $this->addSql('DROP INDEX idx_7026602fe9ed820c ON sylius_cms_block_channels'); + $this->addSql('CREATE INDEX IDX_8417B073E9ED820C ON sylius_cms_block_channels (block_id)'); + $this->addSql('ALTER TABLE sylius_cms_block_channels ADD CONSTRAINT FK_7026602FE9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_channels ADD CONSTRAINT FK_7026602F72F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_products DROP FOREIGN KEY FK_3088D8C3E9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_block_products DROP FOREIGN KEY FK_3088D8C34584665A'); + $this->addSql('DROP INDEX idx_3088d8c3e9ed820c ON sylius_cms_block_products'); + $this->addSql('CREATE INDEX IDX_C4B9089FE9ED820C ON sylius_cms_block_products (block_id)'); + $this->addSql('DROP INDEX idx_3088d8c34584665a ON sylius_cms_block_products'); + $this->addSql('CREATE INDEX IDX_C4B9089F4584665A ON sylius_cms_block_products (product_id)'); + $this->addSql('ALTER TABLE sylius_cms_block_products ADD CONSTRAINT FK_3088D8C3E9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_products ADD CONSTRAINT FK_3088D8C34584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_locales DROP FOREIGN KEY FK_49C0AACE9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_block_locales DROP FOREIGN KEY FK_49C0AACE559DFD1'); + $this->addSql('DROP INDEX idx_49c0aace9ed820c ON sylius_cms_block_locales'); + $this->addSql('CREATE INDEX IDX_E1F907BAE9ED820C ON sylius_cms_block_locales (block_id)'); + $this->addSql('DROP INDEX idx_49c0aace559dfd1 ON sylius_cms_block_locales'); + $this->addSql('CREATE INDEX IDX_E1F907BAE559DFD1 ON sylius_cms_block_locales (locale_id)'); + $this->addSql('ALTER TABLE sylius_cms_block_locales ADD CONSTRAINT FK_49C0AACE9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_locales ADD CONSTRAINT FK_49C0AACE559DFD1 FOREIGN KEY (locale_id) REFERENCES sylius_locale (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_media_translation DROP FOREIGN KEY FK_AAAC4A922C2AC5D3'); + $this->addSql('DROP INDEX idx_aaac4a922c2ac5d3 ON sylius_cms_media_translation'); + $this->addSql('CREATE INDEX IDX_1FEC58972C2AC5D3 ON sylius_cms_media_translation (translatable_id)'); + $this->addSql('DROP INDEX sylius_cms_media_translation_uniq_trans ON sylius_cms_media_translation'); + $this->addSql('CREATE UNIQUE INDEX bitbag_cms_media_translation_uniq_trans ON sylius_cms_media_translation (translatable_id, locale)'); + $this->addSql('ALTER TABLE sylius_cms_media_translation ADD CONSTRAINT FK_AAAC4A922C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_cms_media (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_page_channels DROP FOREIGN KEY FK_E8AF4F7FC4663E4'); + $this->addSql('ALTER TABLE sylius_cms_page_channels DROP FOREIGN KEY FK_E8AF4F7F72F5A1AA'); + $this->addSql('DROP INDEX idx_e8af4f7fc4663e4 ON sylius_cms_page_channels'); + $this->addSql('CREATE INDEX IDX_DCA4269C4663E4 ON sylius_cms_page_channels (page_id)'); + $this->addSql('DROP INDEX idx_e8af4f7f72f5a1aa ON sylius_cms_page_channels'); + $this->addSql('CREATE INDEX IDX_DCA426972F5A1AA ON sylius_cms_page_channels (channel_id)'); + $this->addSql('ALTER TABLE sylius_cms_page_channels ADD CONSTRAINT FK_E8AF4F7FC4663E4 FOREIGN KEY (page_id) REFERENCES sylius_cms_page (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_page_channels ADD CONSTRAINT FK_E8AF4F7F72F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_content_configuration DROP FOREIGN KEY FK_BB97608DE9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_content_configuration DROP FOREIGN KEY FK_BB97608DC4663E4'); + $this->addSql('DROP INDEX idx_bb97608de9ed820c ON sylius_cms_content_configuration'); + $this->addSql('CREATE INDEX IDX_D899EFA7E9ED820C ON sylius_cms_content_configuration (block_id)'); + $this->addSql('DROP INDEX idx_bb97608dc4663e4 ON sylius_cms_content_configuration'); + $this->addSql('CREATE INDEX IDX_D899EFA7C4663E4 ON sylius_cms_content_configuration (page_id)'); + $this->addSql('ALTER TABLE sylius_cms_content_configuration ADD CONSTRAINT FK_BB97608DE9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id)'); + $this->addSql('ALTER TABLE sylius_cms_content_configuration ADD CONSTRAINT FK_BB97608DC4663E4 FOREIGN KEY (page_id) REFERENCES sylius_cms_page (id)'); + $this->addSql('ALTER TABLE sylius_cms_section_media DROP FOREIGN KEY FK_665F6C81D823E37A'); + $this->addSql('ALTER TABLE sylius_cms_section_media DROP FOREIGN KEY FK_665F6C81EA9FDD75'); + $this->addSql('DROP INDEX idx_665f6c81ea9fdd75 ON sylius_cms_section_media'); + $this->addSql('CREATE INDEX IDX_833A6197EA9FDD75 ON sylius_cms_section_media (media_id)'); + $this->addSql('DROP INDEX idx_665f6c81d823e37a ON sylius_cms_section_media'); + $this->addSql('CREATE INDEX IDX_833A6197D823E37A ON sylius_cms_section_media (section_id)'); + $this->addSql('ALTER TABLE sylius_cms_section_media ADD CONSTRAINT FK_665F6C81D823E37A FOREIGN KEY (section_id) REFERENCES sylius_cms_section (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_media ADD CONSTRAINT FK_665F6C81EA9FDD75 FOREIGN KEY (media_id) REFERENCES sylius_cms_media (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_blocks DROP FOREIGN KEY FK_5DE81928D823E37A'); + $this->addSql('ALTER TABLE sylius_cms_section_blocks DROP FOREIGN KEY FK_5DE81928E9ED820C'); + $this->addSql('DROP INDEX idx_5de81928d823e37a ON sylius_cms_section_blocks'); + $this->addSql('CREATE INDEX IDX_A9D9C974D823E37A ON sylius_cms_section_blocks (section_id)'); + $this->addSql('DROP INDEX idx_5de81928e9ed820c ON sylius_cms_section_blocks'); + $this->addSql('CREATE INDEX IDX_A9D9C974E9ED820C ON sylius_cms_section_blocks (block_id)'); + $this->addSql('ALTER TABLE sylius_cms_section_blocks ADD CONSTRAINT FK_5DE81928D823E37A FOREIGN KEY (section_id) REFERENCES sylius_cms_section (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_section_blocks ADD CONSTRAINT FK_5DE81928E9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_page_translation DROP FOREIGN KEY FK_6D0D401B2C2AC5D3'); + $this->addSql('DROP INDEX sylius_cms_page_translation_uniq_trans ON sylius_cms_page_translation'); + $this->addSql('CREATE UNIQUE INDEX bitbag_cms_page_translation_uniq_trans ON sylius_cms_page_translation (translatable_id, locale)'); + $this->addSql('DROP INDEX idx_6d0d401b2c2ac5d3 ON sylius_cms_page_translation'); + $this->addSql('CREATE INDEX IDX_FDD074A62C2AC5D3 ON sylius_cms_page_translation (translatable_id)'); + $this->addSql('ALTER TABLE sylius_cms_page_translation ADD CONSTRAINT FK_6D0D401B2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_cms_page (id) ON DELETE CASCADE'); + $this->addSql('DROP INDEX uniq_d4dd0c0777153098 ON sylius_cms_section'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_421D079777153098 ON sylius_cms_section (code)'); + $this->addSql('DROP INDEX uniq_9d2248bc77153098 ON sylius_cms_block'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_321C84CF77153098 ON sylius_cms_block (code)'); + $this->addSql('ALTER TABLE sylius_cms_block_taxons DROP FOREIGN KEY FK_5397DD03E9ED820C'); + $this->addSql('ALTER TABLE sylius_cms_block_taxons DROP FOREIGN KEY FK_5397DD03DE13F470'); + $this->addSql('DROP INDEX idx_5397dd03de13f470 ON sylius_cms_block_taxons'); + $this->addSql('CREATE INDEX IDX_E324C6CEDE13F470 ON sylius_cms_block_taxons (taxon_id)'); + $this->addSql('DROP INDEX idx_5397dd03e9ed820c ON sylius_cms_block_taxons'); + $this->addSql('CREATE INDEX IDX_E324C6CEE9ED820C ON sylius_cms_block_taxons (block_id)'); + $this->addSql('ALTER TABLE sylius_cms_block_taxons ADD CONSTRAINT FK_5397DD03E9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_taxons ADD CONSTRAINT FK_5397DD03DE13F470 FOREIGN KEY (taxon_id) REFERENCES sylius_taxon (id) ON DELETE CASCADE'); + } +} diff --git a/src/Migrations/Version20240910113936.php b/src/Migrations/Version20240910113936.php new file mode 100644 index 000000000..f65ad059e --- /dev/null +++ b/src/Migrations/Version20240910113936.php @@ -0,0 +1,36 @@ +addSql('ALTER TABLE sylius_cms_page DROP FOREIGN KEY FK_2C2740B2F56F16CF'); + $this->addSql('DROP INDEX IDX_2C2740B2F56F16CF ON sylius_cms_page'); + $this->addSql('ALTER TABLE sylius_cms_page DROP teaser_image_id, DROP teaser_title, DROP teaser_content'); + $this->addSql('ALTER TABLE sylius_cms_page_translation ADD teaser_image_id INT DEFAULT NULL, ADD teaser_title VARCHAR(255) DEFAULT NULL, ADD teaser_content LONGTEXT DEFAULT NULL'); + $this->addSql('ALTER TABLE sylius_cms_page_translation ADD CONSTRAINT FK_6D0D401BF56F16CF FOREIGN KEY (teaser_image_id) REFERENCES sylius_cms_media (id) ON DELETE SET NULL'); + $this->addSql('CREATE INDEX IDX_6D0D401BF56F16CF ON sylius_cms_page_translation (teaser_image_id)'); + } + + public function down(Schema $schema): void + { + $this->addSql('ALTER TABLE sylius_cms_page ADD teaser_image_id INT DEFAULT NULL, ADD teaser_title VARCHAR(255) DEFAULT NULL, ADD teaser_content LONGTEXT DEFAULT NULL'); + $this->addSql('ALTER TABLE sylius_cms_page ADD CONSTRAINT FK_2C2740B2F56F16CF FOREIGN KEY (teaser_image_id) REFERENCES sylius_cms_media (id) ON DELETE SET NULL'); + $this->addSql('CREATE INDEX IDX_2C2740B2F56F16CF ON sylius_cms_page (teaser_image_id)'); + $this->addSql('ALTER TABLE sylius_cms_page_translation DROP FOREIGN KEY FK_6D0D401BF56F16CF'); + $this->addSql('DROP INDEX IDX_6D0D401BF56F16CF ON sylius_cms_page_translation'); + $this->addSql('ALTER TABLE sylius_cms_page_translation DROP teaser_image_id, DROP teaser_title, DROP teaser_content'); + } +} diff --git a/src/Migrations/Version20240912094638.php b/src/Migrations/Version20240912094638.php new file mode 100644 index 000000000..80e6e51ae --- /dev/null +++ b/src/Migrations/Version20240912094638.php @@ -0,0 +1,31 @@ +addSql('ALTER TABLE sylius_cms_content_configuration ADD locale VARCHAR(255) NOT NULL'); + } + + public function down(Schema $schema): void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('ALTER TABLE sylius_cms_content_configuration DROP locale'); + } +} diff --git a/src/Migrations/Version20240916100051.php b/src/Migrations/Version20240916100051.php new file mode 100644 index 000000000..a7ee9501f --- /dev/null +++ b/src/Migrations/Version20240916100051.php @@ -0,0 +1,30 @@ +addSql('ALTER TABLE sylius_cms_block_locales DROP FOREIGN KEY FK_49C0AACE559DFD1'); + $this->addSql('ALTER TABLE sylius_cms_block_locales DROP FOREIGN KEY FK_49C0AACE9ED820C'); + $this->addSql('DROP TABLE sylius_cms_block_locales'); + } + + public function down(Schema $schema): void + { + $this->addSql('CREATE TABLE sylius_cms_block_locales (block_id INT NOT NULL, locale_id INT NOT NULL, INDEX IDX_49C0AACE9ED820C (block_id), INDEX IDX_49C0AACE559DFD1 (locale_id), PRIMARY KEY(block_id, locale_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB COMMENT = \'\' '); + $this->addSql('ALTER TABLE sylius_cms_block_locales ADD CONSTRAINT FK_49C0AACE559DFD1 FOREIGN KEY (locale_id) REFERENCES sylius_locale (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE sylius_cms_block_locales ADD CONSTRAINT FK_49C0AACE9ED820C FOREIGN KEY (block_id) REFERENCES sylius_cms_block (id) ON DELETE CASCADE'); + } +} diff --git a/src/Processor/ImportProcessor.php b/src/Processor/ImportProcessor.php index 2b32379a9..f06277dab 100644 --- a/src/Processor/ImportProcessor.php +++ b/src/Processor/ImportProcessor.php @@ -1,19 +1,13 @@ importerChain->getImporterForResource($resourceCode); + $importer = $this->importerChain->getImporterForResource($resourceName); $data = $this->reader->read($filePath); foreach ($data as $index => $row) { try { $importer->import($row); } catch (\Exception $exception) { - $index += 1; + ++$index; throw new ImportFailedException($exception->getMessage(), $index); } diff --git a/src/Processor/ImportProcessorInterface.php b/src/Processor/ImportProcessorInterface.php index 325e045a6..8760fc1eb 100644 --- a/src/Processor/ImportProcessorInterface.php +++ b/src/Processor/ImportProcessorInterface.php @@ -1,14 +1,8 @@ setHeaderOffset(0)->getIterator(); + return Reader::createFromPath($filePath)->setHeaderOffset(0)->getIterator(); } } diff --git a/src/Reader/ReaderInterface.php b/src/Reader/ReaderInterface.php index 71eb55e79..4aaa54490 100755 --- a/src/Reader/ReaderInterface.php +++ b/src/Reader/ReaderInterface.php @@ -1,14 +1,8 @@ template = $template; + } + + public function setTwigEnvironment(Environment $twig): void + { + $this->twig = $twig; + } +} diff --git a/src/Renderer/ContentElement/ContentElementRendererInterface.php b/src/Renderer/ContentElement/ContentElementRendererInterface.php index 9a3f2746f..add27e6dd 100644 --- a/src/Renderer/ContentElement/ContentElementRendererInterface.php +++ b/src/Renderer/ContentElement/ContentElementRendererInterface.php @@ -1,16 +1,10 @@ getType(); @@ -31,8 +20,8 @@ public function render(ContentConfigurationInterface $contentConfiguration): str $headingType = $configuration['heading_type']; $headingContent = $configuration['heading']; - return $this->twig->render('@BitBagSyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ - 'content_element' => '@BitBagSyliusCmsPlugin/Shop/ContentElement/_heading.html.twig', + return $this->twig->render('@SyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ + 'content_element' => $this->template, 'heading_type' => $headingType, 'heading_content' => $headingContent, ]); diff --git a/src/Renderer/ContentElement/MultipleMediaContentElementRenderer.php b/src/Renderer/ContentElement/MultipleMediaContentElementRenderer.php index 821d937b4..940221ee5 100644 --- a/src/Renderer/ContentElement/MultipleMediaContentElementRenderer.php +++ b/src/Renderer/ContentElement/MultipleMediaContentElementRenderer.php @@ -1,26 +1,18 @@ twig->render('@BitBagSyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ - 'content_element' => '@BitBagSyliusCmsPlugin/Shop/ContentElement/_multiple_media.html.twig', + return $this->twig->render('@SyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ + 'content_element' => $this->template, 'media' => $media, ]); } diff --git a/src/Renderer/ContentElement/PagesCollectionContentElementRenderer.php b/src/Renderer/ContentElement/PagesCollectionContentElementRenderer.php index 543d18d0a..09899c3b2 100644 --- a/src/Renderer/ContentElement/PagesCollectionContentElementRenderer.php +++ b/src/Renderer/ContentElement/PagesCollectionContentElementRenderer.php @@ -1,25 +1,17 @@ collectionRepository->findOneBy(['code' => $code]); - return $this->twig->render('@BitBagSyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ - 'content_element' => '@BitBagSyliusCmsPlugin/Shop/ContentElement/_pages_collection.html.twig', + return $this->twig->render('@SyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ + 'content_element' => $this->template, 'collection' => $collection?->getPages(), ]); } diff --git a/src/Renderer/ContentElement/ProductsCarouselByTaxonContentElementRenderer.php b/src/Renderer/ContentElement/ProductsCarouselByTaxonContentElementRenderer.php index 14a47edb0..a8963857b 100644 --- a/src/Renderer/ContentElement/ProductsCarouselByTaxonContentElementRenderer.php +++ b/src/Renderer/ContentElement/ProductsCarouselByTaxonContentElementRenderer.php @@ -1,26 +1,18 @@ productRepository->findByTaxon($taxon); - return $this->twig->render('@BitBagSyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ - 'content_element' => '@BitBagSyliusCmsPlugin/Shop/ContentElement/_products_carousel.html.twig', + return $this->twig->render('@SyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ + 'content_element' => $this->template, 'products' => $products, ]); } diff --git a/src/Renderer/ContentElement/ProductsCarouselContentElementRenderer.php b/src/Renderer/ContentElement/ProductsCarouselContentElementRenderer.php index 180290e98..058f234d4 100644 --- a/src/Renderer/ContentElement/ProductsCarouselContentElementRenderer.php +++ b/src/Renderer/ContentElement/ProductsCarouselContentElementRenderer.php @@ -1,24 +1,16 @@ twig->render('@BitBagSyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ - 'content_element' => '@BitBagSyliusCmsPlugin/Shop/ContentElement/_products_carousel.html.twig', + return $this->twig->render('@SyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ + 'content_element' => $this->template, 'products' => $products, ]); } diff --git a/src/Renderer/ContentElement/ProductsGridByTaxonContentElementRenderer.php b/src/Renderer/ContentElement/ProductsGridByTaxonContentElementRenderer.php index c704ae08a..3f8743e16 100644 --- a/src/Renderer/ContentElement/ProductsGridByTaxonContentElementRenderer.php +++ b/src/Renderer/ContentElement/ProductsGridByTaxonContentElementRenderer.php @@ -1,26 +1,18 @@ productRepository->findByTaxon($taxon); - return $this->twig->render('@BitBagSyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ - 'content_element' => '@BitBagSyliusCmsPlugin/Shop/ContentElement/_products_grid.html.twig', + return $this->twig->render('@SyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ + 'content_element' => $this->template, 'products' => $products, ]); } diff --git a/src/Renderer/ContentElement/ProductsGridContentElementRenderer.php b/src/Renderer/ContentElement/ProductsGridContentElementRenderer.php index 1b24a451f..5fd30d311 100644 --- a/src/Renderer/ContentElement/ProductsGridContentElementRenderer.php +++ b/src/Renderer/ContentElement/ProductsGridContentElementRenderer.php @@ -1,24 +1,16 @@ productRepository->findBy(['code' => $productsCodes]); - return $this->twig->render('@BitBagSyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ - 'content_element' => '@BitBagSyliusCmsPlugin/Shop/ContentElement/_products_grid.html.twig', + return $this->twig->render('@SyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ + 'content_element' => $this->template, 'products' => $products, ]); } diff --git a/src/Renderer/ContentElement/SingleMediaContentElementRenderer.php b/src/Renderer/ContentElement/SingleMediaContentElementRenderer.php index 348b705ed..fb005ab1d 100644 --- a/src/Renderer/ContentElement/SingleMediaContentElementRenderer.php +++ b/src/Renderer/ContentElement/SingleMediaContentElementRenderer.php @@ -1,25 +1,17 @@ $this->mediaRepository->findOneBy(['code' => $code]), ]; - return $this->twig->render('@BitBagSyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ - 'content_element' => '@BitBagSyliusCmsPlugin/Shop/ContentElement/_single_media.html.twig', + return $this->twig->render('@SyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ + 'content_element' => $this->template, 'media' => $media, ]); } diff --git a/src/Renderer/ContentElement/SpacerContentElementRenderer.php b/src/Renderer/ContentElement/SpacerContentElementRenderer.php index ed52840a3..99dbc8c69 100644 --- a/src/Renderer/ContentElement/SpacerContentElementRenderer.php +++ b/src/Renderer/ContentElement/SpacerContentElementRenderer.php @@ -1,25 +1,14 @@ getType(); @@ -29,8 +18,8 @@ public function render(ContentConfigurationInterface $contentConfiguration): str { $configuration = (int) $contentConfiguration->getConfiguration()['spacer']; - return $this->twig->render('@BitBagSyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ - 'content_element' => '@BitBagSyliusCmsPlugin/Shop/ContentElement/_spacer.html.twig', + return $this->twig->render('@SyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ + 'content_element' => $this->template, 'spacer_height' => $configuration, ]); } diff --git a/src/Renderer/ContentElement/TaxonsListContentElementRenderer.php b/src/Renderer/ContentElement/TaxonsListContentElementRenderer.php index de28c149a..78c463b49 100644 --- a/src/Renderer/ContentElement/TaxonsListContentElementRenderer.php +++ b/src/Renderer/ContentElement/TaxonsListContentElementRenderer.php @@ -1,24 +1,16 @@ taxonRepository->findBy(['code' => $taxonsCodes]); - return $this->twig->render('@BitBagSyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ - 'content_element' => '@BitBagSyliusCmsPlugin/Shop/ContentElement/_taxons_list.html.twig', + return $this->twig->render('@SyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ + 'content_element' => $this->template, 'taxons' => $taxons, ]); } diff --git a/src/Renderer/ContentElement/TextareaContentElementRenderer.php b/src/Renderer/ContentElement/TextareaContentElementRenderer.php index 46674d8ec..2b666d076 100644 --- a/src/Renderer/ContentElement/TextareaContentElementRenderer.php +++ b/src/Renderer/ContentElement/TextareaContentElementRenderer.php @@ -1,25 +1,14 @@ getType(); @@ -27,8 +16,8 @@ public function supports(ContentConfigurationInterface $contentConfiguration): b public function render(ContentConfigurationInterface $contentConfiguration): string { - return $this->twig->render('@BitBagSyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ - 'content_element' => '@BitBagSyliusCmsPlugin/Shop/ContentElement/_textarea.html.twig', + return $this->twig->render('@SyliusCmsPlugin/Shop/ContentElement/index.html.twig', [ + 'content_element' => $this->template, 'content' => $contentConfiguration->getConfiguration()['textarea'], ]); } diff --git a/src/Renderer/ContentElementRendererStrategy.php b/src/Renderer/ContentElementRendererStrategy.php index 7dd645e35..2f4fc6bc9 100644 --- a/src/Renderer/ContentElementRendererStrategy.php +++ b/src/Renderer/ContentElementRendererStrategy.php @@ -1,19 +1,14 @@ getContentElements() as $contentElement) { + if ($contentElement->getLocale() !== $this->localeContext->getLocaleCode()) { + continue; + } + foreach ($this->renderers as $renderer) { if ($renderer->supports($contentElement)) { $content .= html_entity_decode($renderer->render($contentElement), \ENT_QUOTES); diff --git a/src/Renderer/ContentElementRendererStrategyInterface.php b/src/Renderer/ContentElementRendererStrategyInterface.php index e895b8bf1..8f937d985 100644 --- a/src/Renderer/ContentElementRendererStrategyInterface.php +++ b/src/Renderer/ContentElementRendererStrategyInterface.php @@ -1,17 +1,11 @@ $this->urlGenerator->generate( - 'bitbag_sylius_cms_plugin_shop_page_show', + 'sylius_cms_shop_page_show', ['slug' => $page->getSlug()], UrlGeneratorInterface::ABSOLUTE_URL, ), diff --git a/src/Renderer/PageLinkRendererInterface.php b/src/Renderer/PageLinkRendererInterface.php index a7a80001b..ed9c23385 100644 --- a/src/Renderer/PageLinkRendererInterface.php +++ b/src/Renderer/PageLinkRendererInterface.php @@ -1,16 +1,10 @@ localeRepository->findOneBy(['code' => $this->localeContext->getLocaleCode()]); - Assert::notNull($locale); - - if (false === $block->hasLocale($locale) && 0 !== $block->getLocales()->count()) { - $this->logger->warning(sprintf( - 'Block with "%s" code was found in the database, but it does not have "%s" locale.', - $code, - $this->localeContext->getLocaleCode(), - )); - - return null; - } - return $block; } } diff --git a/src/Resolver/BlockResourceResolverInterface.php b/src/Resolver/BlockResourceResolverInterface.php index cd5317ec2..1c28c19d8 100755 --- a/src/Resolver/BlockResourceResolverInterface.php +++ b/src/Resolver/BlockResourceResolverInterface.php @@ -1,16 +1,10 @@ factory, $factoryMethod]; if (is_callable($callback) && method_exists($this->factory, $factoryMethod)) { - return call_user_func($callback); + return $callback(); } throw new BadFunctionCallException('Provided method' . $factoryMethod . ' is not callable'); diff --git a/src/Resolver/ResourceResolverInterface.php b/src/Resolver/ResourceResolverInterface.php index 33beb1227..aa151a10d 100644 --- a/src/Resolver/ResourceResolverInterface.php +++ b/src/Resolver/ResourceResolverInterface.php @@ -1,14 +1,8 @@ { - const cmsLoadTemplate = $('[data-bb-cms-load-template]'); - const cmsPageTemplate = $('#bitbag_sylius_cms_plugin_page_template'); - const cmsBlockTemplate = $('#bitbag_sylius_cms_plugin_block_template'); - - cmsLoadTemplate.on('click', function (e) { - e.preventDefault(); - - if (!cmsPageTemplate.val() && !cmsBlockTemplate.val()) { - return; - } - - $('#load-template-confirmation-modal').modal('show'); - }); - - $('#load-template-confirmation-button').on('click', function () { - const templateId = cmsPageTemplate.val() ?? cmsBlockTemplate.val(); - if (!templateId) { - return; - } - - const endpointUrl = cmsLoadTemplate.data('bb-cms-load-template').replace('REPLACE_ID', templateId); - if (!endpointUrl) { - return; - } - - $.ajax({ - url: endpointUrl, - type: 'GET', - success: function(data) { - if (data.status === 'success') { - $('[id^="bitbag_sylius_cms_plugin_"][id$="contentElements"]') - .children('[data-form-collection="list"]') - .html(''); - - $.each(data.content, function () { - $('[data-form-collection="add"]').trigger('click'); - }); - - const elements = $('[id^="bitbag_sylius_cms_plugin_"][id*="_contentElements_"][id$="_type"]').filter(function() { - return /_page_|_block_/.test(this.id); - }); - - $.each(data.content, function (index, element) { - elements.eq(index).val(element.type); - elements.eq(index).change(); - }); - } else { - console.error(data.message); - } - }, - error: function(jqXHR, textStatus, errorThrown) { - console.error('Error:', textStatus, errorThrown); - } - }); - }); - }); - } -} - -export default HandleTemplate; diff --git a/src/Resources/assets/admin/js/bitbag/index.js b/src/Resources/assets/admin/js/bitbag/index.js deleted file mode 100644 index a45ef41e2..000000000 --- a/src/Resources/assets/admin/js/bitbag/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import './bitbag-content-configuration'; -export {HandleCsvUpload} from './bitbag-upload-csv'; -export {HandleSlugUpdate} from './bitbag-page-slug'; -export {HandlePreview} from './bitbag-cms-preview'; -export {HandleAutoComplete} from './bitbag-media-autocomplete'; -export {HandleChooseCollectionType} from './bitbag-choose-collection-type'; -export {HandleTemplate} from './bitbag-template'; diff --git a/src/Resources/assets/admin/js/bitbag/bitbag-choose-collection-type.js b/src/Resources/assets/admin/js/cms/cms-choose-collection-type.js similarity index 69% rename from src/Resources/assets/admin/js/bitbag/bitbag-choose-collection-type.js rename to src/Resources/assets/admin/js/cms/cms-choose-collection-type.js index f2b39f95c..6f29493ee 100644 --- a/src/Resources/assets/admin/js/bitbag/bitbag-choose-collection-type.js +++ b/src/Resources/assets/admin/js/cms/cms-choose-collection-type.js @@ -1,13 +1,7 @@ -/* - * This file was created by developers working at BitBag - * Do you need more information about us and what we do? Visit our https://bitbag.io website! - * We are hiring developers from all over the world. Join us and start your new, exciting adventure and become part of us: https://bitbag.io/career -*/ - export class HandleChooseCollectionType { init() { window.addEventListener('DOMContentLoaded', () => { - const typeField = document.getElementById('bitbag_sylius_cms_plugin_collection_type'); + const typeField = document.getElementById('sylius_cms_collection_type'); const fields = { page: document.getElementById('collection-type-pages'), block: document.getElementById('collection-type-blocks'), diff --git a/src/Resources/assets/admin/js/bitbag/bitbag-content-configuration.js b/src/Resources/assets/admin/js/cms/cms-content-configuration.js similarity index 74% rename from src/Resources/assets/admin/js/bitbag/bitbag-content-configuration.js rename to src/Resources/assets/admin/js/cms/cms-content-configuration.js index 4e5739019..1320437a4 100644 --- a/src/Resources/assets/admin/js/bitbag/bitbag-content-configuration.js +++ b/src/Resources/assets/admin/js/cms/cms-content-configuration.js @@ -1,11 +1,33 @@ -/* - * This file was created by developers working at BitBag - * Do you need more information about us and what we do? Visit our https://bitbag.io website! - * We are hiring developers from all over the world. Join us and start your new, exciting adventure and become part of us: https://bitbag.io/career -*/ - $(document).ready(function() { - $('.bitbag-media-autocomplete, .sylius-autocomplete').each((index, element) => { + const localeSelector = $('.locale-selector'); + const contentElementsContainer = $('.content-elements-container'); + + function updateContentElementsVisibility() { + const selectedLocale = localeSelector.val(); + + contentElementsContainer.find('.bb-collection-item').each(function() { + const $element = $(this); + const elementLocale = $element.find('input[name$="[locale]"]').val(); + + if (elementLocale === selectedLocale) { + $element.show(); + } else { + $element.hide(); + } + }); + } + + localeSelector.on('change', function() { + updateContentElementsVisibility(); + }); + + contentElementsContainer.on('contentElementAdded', function() { + updateContentElementsVisibility(); + }); + + updateContentElementsVisibility(); + + $('.cms-media-autocomplete, .sylius-autocomplete').each((index, element) => { $(element).autoComplete(); }); @@ -25,12 +47,12 @@ $(document).ready(function() { extraPlugins: ["mediaVideo", "mediaImage"], removePlugins: ["exportpdf"], filebrowserUploadUrl: "/admin/editor/upload-image", - bodyId: "bitbag-ckeditor", + bodyId: "cms-ckeditor", language: "en-us" }; - let pageElements = '#bitbag_sylius_cms_plugin_page_contentElements'; - let blockElements = '#bitbag_sylius_cms_plugin_block_contentElements'; + let pageElements = '#sylius_cms_page_contentElements'; + let blockElements = '#sylius_cms_block_contentElements'; let collectionHolder = $(pageElements).length ? pageElements : blockElements; let itemElement = document.querySelector(`${collectionHolder} [data-form-collection="item"]`); @@ -40,7 +62,7 @@ $(document).ready(function() { } $(document).on('collection-form-add', () => { - $('.bitbag-media-autocomplete, .sylius-autocomplete').each((index, element) => { + $('.cms-media-autocomplete, .sylius-autocomplete').each((index, element) => { if ($._data($(element).get(0), 'events') === undefined) { $(element).autoComplete(); } @@ -49,8 +71,9 @@ $(document).ready(function() { $(`${collectionHolder} [data-form-collection="item"]`).each((index, element) => { $(document).loadContentConfiguration(element); }); - }); + $('.bb-collection-item:last-child').find('input[name$="[locale]"]').val(localeSelector.val()); + }); $.fn.extend({ loadContentConfiguration(target) { target.querySelector(`${collectionHolder} select[name*="type"]`).onchange = function () { @@ -58,36 +81,28 @@ $(document).ready(function() { const newConfig = document.createElement('div'); const selectedOption = this.selectedOptions[0]; newConfig.innerHTML = selectedOption.getAttribute('data-configuration'); - const oldConfig = parent.nextElementSibling; - parent.parentElement.replaceChild(newConfig, oldConfig); - let oldConfigInput = oldConfig.querySelector('input'); if (!oldConfigInput) { oldConfigInput = oldConfig.querySelector('textarea'); } - const oldConfigInputName = oldConfigInput.getAttribute('name'); - let newConfigInputs = newConfig.querySelectorAll('input'); if (!newConfigInputs.length) { newConfigInputs = newConfig.querySelectorAll('textarea'); } - newConfigInputs.forEach(element => { let newConfigInputName = element.getAttribute('name'); if (!newConfigInputName) { return; } - newConfigInputName = oldConfigInputName.replace( oldConfigInputName.substring(oldConfigInputName.indexOf('[configuration]') + 15), newConfigInputName.substring(newConfigInputName.indexOf('configuration') + 13), ); - $(element).attr('name', newConfigInputName); - $(newConfig).find('.bitbag-media-autocomplete').autoComplete(); + $(newConfig).find('.cms-media-autocomplete').autoComplete(); $(newConfig).find('.sylius-autocomplete').autoComplete(); if (this.value === 'textarea') { @@ -101,7 +116,6 @@ $(document).ready(function() { } } }); - $(`${collectionHolder} [data-form-collection="item"]`).each((index, element) => { $(document).loadContentConfiguration(element); }); diff --git a/src/Resources/assets/admin/js/bitbag/bitbag-media-autocomplete.js b/src/Resources/assets/admin/js/cms/cms-media-autocomplete.js similarity index 92% rename from src/Resources/assets/admin/js/bitbag/bitbag-media-autocomplete.js rename to src/Resources/assets/admin/js/cms/cms-media-autocomplete.js index d132c78b3..d2750e75f 100644 --- a/src/Resources/assets/admin/js/bitbag/bitbag-media-autocomplete.js +++ b/src/Resources/assets/admin/js/cms/cms-media-autocomplete.js @@ -1,8 +1,3 @@ -/* - This file was created by developers working at BitBag - Do you need more information about us and what we do? Visit our https://bitbag.io website! - We are hiring developers from all over the world. Join us and start your new, exciting adventure and become part of us: https://bitbag.io/career -*/ import triggerCustomEvent from '../../../common/js/utilities/triggerCustomEvent'; export class HandleAutoComplete { @@ -33,7 +28,7 @@ export class HandleAutoComplete { init() { if (typeof this.config !== 'object') { - throw new Error('Bitbag CMS Plugin - HandleAutoComplete class config is not a valid object'); + throw new Error('Sylius CMS Plugin - HandleAutoComplete class config is not a valid object'); } this.mediaContainers.forEach((mediaContainer) => { this._handleSavedValue(mediaContainer); @@ -113,7 +108,7 @@ export class HandleAutoComplete { triggerCustomEvent(mediaContainer, 'cms.media.saved.reload.completed', data); } catch (error) { - console.error(`BitBag CMS Plugin - HandleAutoComplete class error : ${error}`); + console.error(`Sylius CMS Plugin - HandleAutoComplete class error : ${error}`); triggerCustomEvent(mediaContainer, 'cms.media.saved.reload.error', error); } finally { mediaContainer.classList.remove('loading'); @@ -139,7 +134,7 @@ export class HandleAutoComplete { triggerCustomEvent(mediaContainer, 'cms.media.display.completed', data); } catch (error) { - console.error(`BitBag CMS Plugin - HandleAutoComplete class error : ${error}`); + console.error(`Sylius CMS Plugin - HandleAutoComplete class error : ${error}`); triggerCustomEvent(mediaContainer, 'cms.media.display.error', error); } finally { mediaContainer.classList.remove('loading'); diff --git a/src/Resources/assets/admin/js/bitbag/bitbag-page-slug.js b/src/Resources/assets/admin/js/cms/cms-page-slug.js similarity index 81% rename from src/Resources/assets/admin/js/bitbag/bitbag-page-slug.js rename to src/Resources/assets/admin/js/cms/cms-page-slug.js index bd146b03a..e27df10c4 100644 --- a/src/Resources/assets/admin/js/bitbag/bitbag-page-slug.js +++ b/src/Resources/assets/admin/js/cms/cms-page-slug.js @@ -1,9 +1,3 @@ -/* - This file was created by developers working at BitBag - Do you need more information about us and what we do? Visit our https://bitbag.io website! - We are hiring developers from all over the world. Join us and start your new, exciting adventure and become part of us: https://bitbag.io/career -*/ - import triggerCustomEvent from '../../../common/js/utilities/triggerCustomEvent'; export class HandleSlugUpdate { @@ -11,8 +5,8 @@ export class HandleSlugUpdate { config = { wrappersIndicator: 'data-bb-cms-wrapper', lockFieldIndicator: 'data-bb-cms-toggle-slug', - bbTarget: 'bitbag_sylius_cms_plugin_page', - nameField: 'bitbag_sylius_cms_plugin_page_name', + bbTarget: 'sylius_cms_page', + nameField: 'sylius_cms_page_name', } ) { this.wrappers = document.querySelectorAll(`[${config.wrappersIndicator}]`); @@ -24,15 +18,15 @@ export class HandleSlugUpdate { init() { if (typeof this.config !== 'object') { - throw new Error('Bitbag CMS Plugin - HandleSlugUpdate class config is not a valid object'); + throw new Error('Sylius CMS Plugin - HandleSlugUpdate class config is not a valid object'); } if (typeof this.lockFieldIndicator !== 'string' || typeof this.bbTarget !== 'string') { - throw new Error('Bitbag CMS Plugin - HandleSlugUpdate class config key values are not valid strings'); + throw new Error('Sylius CMS Plugin - HandleSlugUpdate class config key values are not valid strings'); } if (!this.nameField ) { - throw new Error('Bitbag CMS Plugin - HandleSlugUpdate name field not found'); + throw new Error('Sylius CMS Plugin - HandleSlugUpdate name field not found'); } this._handleFields(); @@ -90,7 +84,7 @@ export class HandleSlugUpdate { const response = await request.json(); return response.slug; } catch (error) { - console.error(`BitBag CMS Plugin - HandleSlugUpdate class error : ${error}`); + console.error(`Sylius CMS Plugin - HandleSlugUpdate class error : ${error}`); } } diff --git a/src/Resources/assets/admin/js/bitbag/bitbag-cms-preview.js b/src/Resources/assets/admin/js/cms/cms-preview.js similarity index 87% rename from src/Resources/assets/admin/js/bitbag/bitbag-cms-preview.js rename to src/Resources/assets/admin/js/cms/cms-preview.js index e589b5a9b..9104531f3 100644 --- a/src/Resources/assets/admin/js/bitbag/bitbag-cms-preview.js +++ b/src/Resources/assets/admin/js/cms/cms-preview.js @@ -1,9 +1,3 @@ -/* - This file was created by developers working at BitBag - Do you need more information about us and what we do? Visit our https://bitbag.io website! - We are hiring developers from all over the world. Join us and start your new, exciting adventure and become part of us: https://bitbag.io/career -*/ - import triggerCustomEvent from '../../../common/js/utilities/triggerCustomEvent'; export class HandlePreview { @@ -24,14 +18,14 @@ export class HandlePreview { } init() { if (typeof this.config !== 'object') { - throw new Error('Bitbag CMS Plugin - HandlePreview class config is not a valid object'); + throw new Error('Sylius CMS Plugin - HandlePreview class config is not a valid object'); } if ( typeof this.localeSelector !== 'string' || typeof this.channelSelector !== 'string' || typeof this.modalSelector !== 'string' ) { - throw new Error('Bitbag CMS Plugin - HandlePreview class config key values are not valid strings'); + throw new Error('Sylius CMS Plugin - HandlePreview class config key values are not valid strings'); } this._resourcePreview(); } @@ -94,7 +88,7 @@ export class HandlePreview { this.modal.querySelector('iframe').src = blobUrl; triggerCustomEvent(this.modal, 'cms.create.preview.completed', res); } catch (error) { - console.error(`BitBag CMS Plugin - HandlePreview class error : ${error}`); + console.error(`Sylius CMS Plugin - HandlePreview class error : ${error}`); triggerCustomEvent(this.modal, 'cms.create.preview.error', error); } finally { this.modal.querySelector('.ui.loadable').classList.remove('loading'); diff --git a/src/Resources/assets/admin/js/cms/cms-template.js b/src/Resources/assets/admin/js/cms/cms-template.js new file mode 100644 index 000000000..87d631dc0 --- /dev/null +++ b/src/Resources/assets/admin/js/cms/cms-template.js @@ -0,0 +1,90 @@ +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'); + + let locales = []; + $('.locale-selector option').each(function() { + locales.push($(this).val()); + }); + + cmsPageTemplate.on('change', function() { + if ($(this).val()) { + $('#load-template-confirmation-modal').modal('show'); + } + }); + + cmsBlockTemplate.on('change', function() { + if ($(this).val()) { + $('#load-template-confirmation-modal').modal('show'); + } + }); + + $('#load-template-confirmation-button').on('click', function () { + const templateId = cmsPageTemplate.val() ?? cmsBlockTemplate.val(); + if (!templateId) { + return; + } + + const endpointUrl = cmsLoadTemplate.data('bb-cms-load-template').replace('REPLACE_ID', templateId); + if (!endpointUrl) { + return; + } + + $.ajax({ + url: endpointUrl, + type: 'GET', + success: function(data) { + if (data.status === 'success') { + $('[id^="sylius_cms_"][id$="contentElements"]') + .children('[data-form-collection="list"]') + .html(''); + + $.each(data.content, function () { + locales.forEach(function (locale) { + $('[data-form-collection="add"]').trigger('click'); + }); + }); + + const elements = $('.bb-collection-item'); + let idx = 0; + $.each(data.content, function (index, element) { + locales.forEach(function (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); + idx++; + }); + }); + + $('.content-elements-container').find('.bb-collection-item').each(function() { + const $element = $(this); + const elementLocale = $element.find('input[name$="[locale]"]').val(); + + if (elementLocale === $('.locale-selector').val()) { + $element.show(); + } else { + $element.hide(); + } + }); + } else { + console.error(data.message); + } + }, + error: function(jqXHR, textStatus, errorThrown) { + console.error('Error:', textStatus, errorThrown); + } + }); + }); + + $('#load-template-cancel-button').on('click', function () { + cmsPageTemplate.val(''); + cmsBlockTemplate.val(''); + }); + }); + } +} + +export default HandleTemplate; diff --git a/src/Resources/assets/admin/js/bitbag/bitbag-upload-csv.js b/src/Resources/assets/admin/js/cms/cms-upload-csv.js similarity index 70% rename from src/Resources/assets/admin/js/bitbag/bitbag-upload-csv.js rename to src/Resources/assets/admin/js/cms/cms-upload-csv.js index bf2a9c145..00d4664ac 100644 --- a/src/Resources/assets/admin/js/bitbag/bitbag-upload-csv.js +++ b/src/Resources/assets/admin/js/cms/cms-upload-csv.js @@ -1,9 +1,3 @@ -/* - This file was created by developers working at BitBag - Do you need more information about us and what we do? Visit our https://bitbag.io website! - We are hiring developers from all over the world. Join us and start your new, exciting adventure and become part of us: https://bitbag.io/career -*/ - export class HandleCsvUpload { constructor(config = {textField: 'data-bb-cms-text', fileField: 'data-bb-cms-file'}) { this.config = config; @@ -13,7 +7,7 @@ export class HandleCsvUpload { init() { if (typeof this.config !== 'object') { - throw new Error('Bitbag CMS Plugin - HandleCsvUpload class config is not a valid object'); + throw new Error('Sylius CMS Plugin - HandleCsvUpload class config is not a valid object'); } this._handleFields(); diff --git a/src/Resources/assets/admin/js/cms/index.js b/src/Resources/assets/admin/js/cms/index.js new file mode 100644 index 000000000..5ab24a4ec --- /dev/null +++ b/src/Resources/assets/admin/js/cms/index.js @@ -0,0 +1,7 @@ +import './cms-content-configuration'; +export {HandleCsvUpload} from './cms-upload-csv'; +export {HandleSlugUpdate} from './cms-page-slug'; +export {HandlePreview} from './cms-preview'; +export {HandleAutoComplete} from './cms-media-autocomplete'; +export {HandleChooseCollectionType} from './cms-choose-collection-type'; +export {HandleTemplate} from './cms-template'; diff --git a/src/Resources/assets/admin/js/index.js b/src/Resources/assets/admin/js/index.js index 498e17eca..a3587190b 100644 --- a/src/Resources/assets/admin/js/index.js +++ b/src/Resources/assets/admin/js/index.js @@ -5,7 +5,7 @@ import { HandleAutoComplete, HandleChooseCollectionType, HandleTemplate -} from './bitbag'; +} from './cms'; if (document.querySelector('[data-bb-target="cms-import"]')) { new HandleCsvUpload().init(); diff --git a/src/Resources/assets/admin/scss/_css.scss b/src/Resources/assets/admin/scss/_css.scss index d3c63c491..344383c19 100644 --- a/src/Resources/assets/admin/scss/_css.scss +++ b/src/Resources/assets/admin/scss/_css.scss @@ -1,21 +1,21 @@ -#bitbag-cms-resource-preview-modal { +#cms-resource-preview-modal { height: 100%; } -#bitbag-cms-resource-preview-modal iframe { +#cms-resource-preview-modal iframe { width: 100%; height: 100vh; } -#bitbag-cms-resource-preview-modal .ui.header { +#cms-resource-preview-modal .ui.header { padding-bottom: 0; } -.bitbag-cms-import .ui.action.input input[type='file'] { +.cms-import .ui.action.input input[type='file'] { display: none; } -.bitbag-cms-import .ui.action.input input[type='text'] { +.cms-import .ui.action.input input[type='text'] { width: auto; } @@ -96,11 +96,11 @@ } } -.bitbag-media-autocomplete .dropdown.icon { +.cms-media-autocomplete .dropdown.icon { pointer-events: none; } -.bitbag-media-autocomplete .search { +.cms-media-autocomplete .search { cursor: pointer !important; } diff --git a/src/Resources/assets/shop/scss/block/show.scss b/src/Resources/assets/shop/scss/block/show.scss index 4a687f347..b9487635c 100644 --- a/src/Resources/assets/shop/scss/block/show.scss +++ b/src/Resources/assets/shop/scss/block/show.scss @@ -1,4 +1,4 @@ -.bitbag-block { +.cms-block { margin-bottom: 20px; img { diff --git a/src/Resources/config/api_resources/Block.xml b/src/Resources/config/api_resources/Block.xml index 7e4f23d3d..7081e0991 100644 --- a/src/Resources/config/api_resources/Block.xml +++ b/src/Resources/config/api_resources/Block.xml @@ -3,42 +3,51 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://api-platform.com/schema/metadata https://api-platform.com/schema/metadata/metadata-2.0.xsd" > -
@@ -12,20 +12,19 @@
{{ form_row(form.code) }}
{{ form_row(form.enabled) }}
{{ form_row(form.channels) }}
- {{ form_row(form.locales) }}
{{ form_row(form.collections) }}
- {{ 'bitbag_sylius_cms_plugin.ui.preview'|trans }}
+ {{ 'sylius_cms.ui.preview'|trans }}
-
{{ 'bitbag_sylius_cms_plugin.ui.manage_block_display'|trans }}
+{{ 'sylius_cms.ui.manage_block_display'|trans }}
{{ form_row(form.products) }} {{ form_row(form.productsInTaxons) }} {{ form_row(form.taxons) }} @@ -33,8 +32,9 @@
-
{{ 'bitbag_sylius_cms_plugin.ui.content_elements.title'|trans }}
- {% include '@BitBagSyliusCmsPlugin/Template/form.html.twig' with {ajax_url: path('bitbag_sylius_cms_plugin_admin_ajax_template_content_by_id', {'id': 'REPLACE_ID'}) } %} +{{ 'sylius_cms.ui.content_elements.title'|trans }}
+ {% include '@SyliusCmsPlugin/Template/form.html.twig' with {ajax_url: path('sylius_cms_admin_ajax_template_content_by_id', {'id': 'REPLACE_ID'}) } %} + {% include '@SyliusCmsPlugin/Locale/form.html.twig' %}
{{ form_row(form.contentElements) }}
diff --git a/src/Resources/views/Block/preview.html.twig b/src/Resources/views/Block/preview.html.twig
index b34fb16e0..9d8eb74cb 100755
--- a/src/Resources/views/Block/preview.html.twig
+++ b/src/Resources/views/Block/preview.html.twig
@@ -7,7 +7,7 @@
{% block content %}
{% endblock %}
diff --git a/src/Resources/views/Collection/Crud/_form.html.twig b/src/Resources/views/Collection/Crud/_form.html.twig
index cd5b3c5a9..afc93a9c2 100755
--- a/src/Resources/views/Collection/Crud/_form.html.twig
+++ b/src/Resources/views/Collection/Crud/_form.html.twig
@@ -1,5 +1,5 @@
{% from '@SyliusAdmin/Macro/translationForm.html.twig' import translationForm %}
-{% form_theme form '@BitBagSyliusCmsPlugin/Form/theme.html.twig' %}
+{% form_theme form '@SyliusCmsPlugin/Form/theme.html.twig' %}
{{ form_errors(form) }}
diff --git a/src/Resources/views/ContentConfiguration/_action.html.twig b/src/Resources/views/ContentConfiguration/_action.html.twig
index b7f55e28c..fd98adfe9 100644
--- a/src/Resources/views/ContentConfiguration/_action.html.twig
+++ b/src/Resources/views/ContentConfiguration/_action.html.twig
@@ -1,4 +1,4 @@
-{% form_theme field '@BitBagSyliusCmsPlugin/Form/theme.html.twig' %}
+{% form_theme field '@SyliusCmsPlugin/Form/theme.html.twig' %}
{{ form_row(field) }}
diff --git a/src/Resources/views/CrudUi/create.html.twig b/src/Resources/views/CrudUi/create.html.twig
index 98ae01951..3b81f7165 100755
--- a/src/Resources/views/CrudUi/create.html.twig
+++ b/src/Resources/views/CrudUi/create.html.twig
@@ -1,4 +1,4 @@
-{% extends '@BitBagSyliusCmsPlugin/layout.html.twig' %}
+{% extends '@SyliusCmsPlugin/layout.html.twig' %}
{% import '@SyliusUi/Macro/headers.html.twig' as headers %}
diff --git a/src/Resources/views/CrudUi/index.html.twig b/src/Resources/views/CrudUi/index.html.twig
index 02ed75bde..f658effd1 100644
--- a/src/Resources/views/CrudUi/index.html.twig
+++ b/src/Resources/views/CrudUi/index.html.twig
@@ -1,4 +1,4 @@
-{% extends '@BitBagSyliusCmsPlugin/layout.html.twig' %}
+{% extends '@SyliusCmsPlugin/layout.html.twig' %}
{% import '@SyliusUi/Macro/headers.html.twig' as headers %}
diff --git a/src/Resources/views/CrudUi/update.html.twig b/src/Resources/views/CrudUi/update.html.twig
index bb2f65af1..40080fd98 100755
--- a/src/Resources/views/CrudUi/update.html.twig
+++ b/src/Resources/views/CrudUi/update.html.twig
@@ -1,4 +1,4 @@
-{% extends '@BitBagSyliusCmsPlugin/layout.html.twig' %}
+{% extends '@SyliusCmsPlugin/layout.html.twig' %}
{% import '@SyliusUi/Macro/headers.html.twig' as headers %}
{% import '@SyliusUi/Macro/buttons.html.twig' as buttons %}
diff --git a/src/Resources/views/Form/theme.html.twig b/src/Resources/views/Form/theme.html.twig
index 6b2a39579..290dc6dee 100755
--- a/src/Resources/views/Form/theme.html.twig
+++ b/src/Resources/views/Form/theme.html.twig
@@ -1,38 +1,38 @@
{% extends '@SyliusUi/Form/theme.html.twig' %}
-{% block bitbag_collection_autocomplete_choice_row %}
- {{ form_row(form, {'remote_url': path('bitbag_sylius_cms_plugin_admin_ajax_collection_by_name_phrase'), 'load_edit_url': path('bitbag_sylius_cms_plugin_admin_ajax_collection_by_code')}) }}
+{% block sylius_collection_autocomplete_choice_row %}
+ {{ form_row(form, {'remote_url': path('sylius_cms_admin_ajax_collection_by_name_phrase'), 'load_edit_url': path('sylius_cms_admin_ajax_collection_by_code')}) }}
{% endblock %}
-{% block bitbag_page_collection_autocomplete_choice_row %}
- {{ form_row(form, {'remote_url': path('bitbag_sylius_cms_plugin_admin_ajax_page_collection_by_name_phrase'), 'load_edit_url': path('bitbag_sylius_cms_plugin_admin_ajax_collection_by_code')}) }}
+{% block sylius_page_collection_autocomplete_choice_row %}
+ {{ form_row(form, {'remote_url': path('sylius_cms_admin_ajax_page_collection_by_name_phrase'), 'load_edit_url': path('sylius_cms_admin_ajax_collection_by_code')}) }}
{% endblock %}
-{% block bitbag_page_autocomplete_choice_row %}
- {{ form_row(form, {'remote_url': path('bitbag_sylius_cms_plugin_admin_ajax_page_by_name_phrase'), 'load_edit_url': path('bitbag_sylius_cms_plugin_admin_ajax_page_by_code')}) }}
+{% block sylius_page_autocomplete_choice_row %}
+ {{ form_row(form, {'remote_url': path('sylius_cms_admin_ajax_page_by_name_phrase'), 'load_edit_url': path('sylius_cms_admin_ajax_page_by_code')}) }}
{% endblock %}
-{% block bitbag_block_autocomplete_choice_row %}
- {{ form_row(form, {'remote_url': path('bitbag_sylius_cms_plugin_admin_ajax_block_by_name_phrase'), 'load_edit_url': path('bitbag_sylius_cms_plugin_admin_ajax_block_by_code')}) }}
+{% block sylius_block_autocomplete_choice_row %}
+ {{ form_row(form, {'remote_url': path('sylius_cms_admin_ajax_block_by_name_phrase'), 'load_edit_url': path('sylius_cms_admin_ajax_block_by_code')}) }}
{% endblock %}
-{% block bitbag_template_page_autocomplete_choice_row %}
- {{ form_row(form, {'remote_url': path('bitbag_sylius_cms_plugin_admin_ajax_template_page_by_name_phrase'), 'load_edit_url': path('bitbag_sylius_cms_plugin_admin_ajax_template_by_id')}) }}
+{% block sylius_template_page_autocomplete_choice_row %}
+ {{ form_row(form, {'remote_url': path('sylius_cms_admin_ajax_template_page_by_name_phrase'), 'load_edit_url': path('sylius_cms_admin_ajax_template_by_id')}) }}
{% endblock %}
-{% block bitbag_template_block_autocomplete_choice_row %}
- {{ form_row(form, {'remote_url': path('bitbag_sylius_cms_plugin_admin_ajax_template_block_by_name_phrase'), 'load_edit_url': path('bitbag_sylius_cms_plugin_admin_ajax_template_by_id')}) }}
+{% block sylius_template_block_autocomplete_choice_row %}
+ {{ form_row(form, {'remote_url': path('sylius_cms_admin_ajax_template_block_by_name_phrase'), 'load_edit_url': path('sylius_cms_admin_ajax_template_by_id')}) }}
{% endblock %}
-{% block bitbag_media_autocomplete_choice_row %}
+{% block sylius_media_autocomplete_choice_row %}
- {{ bitbag_cms_render_content_elements(block) }}
+ {{ sylius_cms_render_content_elements(block) }}
{{- form_label(form) -}}
{{- form_widget(form, {'attr': {'class': 'autocomplete'}}) -}}
X
@@ -55,11 +55,11 @@
{% endblock %}
{% block sylius_product_autocomplete_choice_row %}
- {{ form_row(form, {'remote_url': path('bitbag_sylius_cms_plugin_admin_ajax_product_by_name_phrase'), 'load_edit_url': path('sylius_admin_ajax_product_by_code')}) }}
+ {{ form_row(form, {'remote_url': path('sylius_cms_admin_ajax_product_by_name_phrase'), 'load_edit_url': path('sylius_admin_ajax_product_by_code')}) }}
{% endblock %}
{% block sylius_taxon_autocomplete_choice_row %}
- {{ form_row(form, {'remote_url': path('bitbag_sylius_cms_plugin_admin_ajax_taxon_by_name_phrase'), 'load_edit_url': path('sylius_admin_ajax_taxon_by_code')}) }}
+ {{ form_row(form, {'remote_url': path('sylius_cms_admin_ajax_taxon_by_name_phrase'), 'load_edit_url': path('sylius_admin_ajax_taxon_by_code')}) }}
{% endblock %}
{% block collection_widget -%}
diff --git a/src/Resources/views/Grid/Action/import.html.twig b/src/Resources/views/Grid/Action/import.html.twig
index bb63c10e2..21fbf091d 100644
--- a/src/Resources/views/Grid/Action/import.html.twig
+++ b/src/Resources/views/Grid/Action/import.html.twig
@@ -1,4 +1,4 @@
{{ render(path(
- 'bitbag_sylius_cms_plugin_admin_import_data',
+ 'sylius_cms_admin_import_data',
{'resourceName': options.resourceCode}
)) }}
diff --git a/src/Resources/views/Grid/Form/_importForm.html.twig b/src/Resources/views/Grid/Form/_importForm.html.twig
index 2577a1097..fdbc12d30 100644
--- a/src/Resources/views/Grid/Form/_importForm.html.twig
+++ b/src/Resources/views/Grid/Form/_importForm.html.twig
@@ -1,15 +1,15 @@
-{% form_theme form '@BitBagSyliusCmsPlugin/Form/theme.html.twig' %}
-
-