From 7fc223ea43d1ff75da9a72e3fbc8bcca03573def Mon Sep 17 00:00:00 2001
From: liszkapawel <pawel.liszka00@gmail.com>
Date: Thu, 4 Aug 2022 16:15:41 +0200
Subject: [PATCH 1/2] Fix webpack configuration and templates

---
 .../Resources/assets/admin/js}/attributeGroups.js         | 0
 src/Resources/assets/admin/js/index.js                    | 1 +
 tests/Application/assets/admin/entry.js                   | 1 -
 tests/Application/config/packages/assets.yaml             | 8 ++++----
 tests/Application/config/packages/webpack_encore.yaml     | 4 ++--
 .../Product/Attribute/attributeChoice.html.twig           | 2 +-
 .../bundles/SyliusAdminBundle/_scripts.html.twig          | 2 +-
 .../templates/bundles/SyliusAdminBundle/_styles.html.twig | 2 +-
 tests/Application/webpack.config.js                       | 5 +++--
 webpack.config.js                                         | 6 +++---
 10 files changed, 16 insertions(+), 15 deletions(-)
 rename {tests/Application/assets/admin/product => src/Resources/assets/admin/js}/attributeGroups.js (100%)

diff --git a/tests/Application/assets/admin/product/attributeGroups.js b/src/Resources/assets/admin/js/attributeGroups.js
similarity index 100%
rename from tests/Application/assets/admin/product/attributeGroups.js
rename to src/Resources/assets/admin/js/attributeGroups.js
diff --git a/src/Resources/assets/admin/js/index.js b/src/Resources/assets/admin/js/index.js
index e69de29..f15f39b 100644
--- a/src/Resources/assets/admin/js/index.js
+++ b/src/Resources/assets/admin/js/index.js
@@ -0,0 +1 @@
+import './attributeGroups'
diff --git a/tests/Application/assets/admin/entry.js b/tests/Application/assets/admin/entry.js
index 011c735..635f5ac 100644
--- a/tests/Application/assets/admin/entry.js
+++ b/tests/Application/assets/admin/entry.js
@@ -1,2 +1 @@
 import 'sylius/bundle/AdminBundle/Resources/private/entry';
-import './product/attributeGroups'
diff --git a/tests/Application/config/packages/assets.yaml b/tests/Application/config/packages/assets.yaml
index dc3319c..16c18b1 100644
--- a/tests/Application/config/packages/assets.yaml
+++ b/tests/Application/config/packages/assets.yaml
@@ -5,7 +5,7 @@ framework:
                 json_manifest_path: '%kernel.project_dir%/public/build/shop/manifest.json'
             admin:
                 json_manifest_path: '%kernel.project_dir%/public/build/admin/manifest.json'
-            skeleton_shop:
-                json_manifest_path: '%kernel.project_dir%/public/build/bitbag/skeleton/shop/manifest.json'
-            skeleton_admin:
-                json_manifest_path: '%kernel.project_dir%/public/build/bitbag/skeleton/admin/manifest.json'
+            product_attribute_groups_shop:
+                json_manifest_path: '%kernel.project_dir%/public/build/bitbag/productAttributeGroups/shop/manifest.json'
+            product_attribute_groups_admin:
+                json_manifest_path: '%kernel.project_dir%/public/build/bitbag/productAttributeGroups/admin/manifest.json'
diff --git a/tests/Application/config/packages/webpack_encore.yaml b/tests/Application/config/packages/webpack_encore.yaml
index ded585b..f3cfe03 100644
--- a/tests/Application/config/packages/webpack_encore.yaml
+++ b/tests/Application/config/packages/webpack_encore.yaml
@@ -3,5 +3,5 @@ webpack_encore:
     builds:
         shop: '%kernel.project_dir%/public/build/shop'
         admin: '%kernel.project_dir%/public/build/admin'
-        skeleton_shop: '%kernel.project_dir%/public/build/bitbag/skeleton/shop'
-        skeleton_admin: '%kernel.project_dir%/public/build/bitbag/skeleton/admin'
+        product_attribute_groups_shop: '%kernel.project_dir%/public/build/bitbag/productAttributeGroups/shop'
+        product_attribute_groups_admin: '%kernel.project_dir%/public/build/bitbag/productAttributeGroups/admin'
diff --git a/tests/Application/templates/bundles/SyliusAdminBundle/Product/Attribute/attributeChoice.html.twig b/tests/Application/templates/bundles/SyliusAdminBundle/Product/Attribute/attributeChoice.html.twig
index 294020c..7ec509d 100644
--- a/tests/Application/templates/bundles/SyliusAdminBundle/Product/Attribute/attributeChoice.html.twig
+++ b/tests/Application/templates/bundles/SyliusAdminBundle/Product/Attribute/attributeChoice.html.twig
@@ -1,7 +1,7 @@
 <div class="ui fluid action input" id="attributeChoice" data-action="{{ path('sylius_admin_render_attribute_forms') }}" style="margin-bottom: 30px;">
     {{ form_widget(form, {'attr': {'class': 'ui fluid search dropdown', 'id': 'sylius_product_attribute_choice', 'data-attributes': ''}}) }}
 
-    <button class="ui olive labeled icon floating dropdown link button" id="add_attributes_group" data-tab="add_attributes_group" tabindex="0" >
+    <button class="ui olive labeled icon floating dropdown button" id="add_attributes_group" data-tab="add_attributes_group" tabindex="0" type="button">
         <i class="icon clipboard list"></i> <span class="text"> {{ 'bitbag_sylius_product_attribute_group_plugin.ui.attributes_group'|trans }} </span>
 
         <div id="menuWithAttributesGroup" class="menu transition hidden" data-attribute-groups tabindex="-1"></div>
diff --git a/tests/Application/templates/bundles/SyliusAdminBundle/_scripts.html.twig b/tests/Application/templates/bundles/SyliusAdminBundle/_scripts.html.twig
index 01be8a1..790e336 100644
--- a/tests/Application/templates/bundles/SyliusAdminBundle/_scripts.html.twig
+++ b/tests/Application/templates/bundles/SyliusAdminBundle/_scripts.html.twig
@@ -1,2 +1,2 @@
 {{ encore_entry_script_tags('admin-entry', null, 'admin') }}
-{{ encore_entry_script_tags('bitbag-skeleton-admin', null, 'skeleton_admin') }}
+{{ encore_entry_script_tags('bitbag-productAttributeGroups-admin', null, 'product_attribute_groups_admin') }}
diff --git a/tests/Application/templates/bundles/SyliusAdminBundle/_styles.html.twig b/tests/Application/templates/bundles/SyliusAdminBundle/_styles.html.twig
index ae833c7..0541c40 100644
--- a/tests/Application/templates/bundles/SyliusAdminBundle/_styles.html.twig
+++ b/tests/Application/templates/bundles/SyliusAdminBundle/_styles.html.twig
@@ -1,2 +1,2 @@
 {{ encore_entry_link_tags('admin-entry', null, 'admin') }}
-{{ encore_entry_link_tags('bitbag-skeleton-admin', null, 'skeleton_admin') }}
+{{ encore_entry_link_tags('bitbag-productAttributeGroups-admin', null, 'product_attribute_groups_admin') }}
diff --git a/tests/Application/webpack.config.js b/tests/Application/webpack.config.js
index 551727c..abca080 100644
--- a/tests/Application/webpack.config.js
+++ b/tests/Application/webpack.config.js
@@ -1,9 +1,10 @@
 const path = require('path');
 const Encore = require('@symfony/webpack-encore');
 
-const [bitbagSkeletonShop, bitbagSkeletonAdmin] = require('../../webpack.config.js')
+const [bitbagProductAttributeGroupsShop, bitbagProductAttributeGroupsAdmin] = require('../../webpack.config.js')
 
 const syliusBundles = path.resolve(__dirname, '../../vendor/sylius/sylius/src/Sylius/Bundle/');
+
 const uiBundleScripts = path.resolve(syliusBundles, 'UiBundle/Resources/private/js/');
 const uiBundleResources = path.resolve(syliusBundles, 'UiBundle/Resources/private/');
 
@@ -46,4 +47,4 @@ adminConfig.resolve.alias['sylius/bundle'] = syliusBundles;
 adminConfig.externals = Object.assign({}, adminConfig.externals, { window: 'window', document: 'document' });
 adminConfig.name = 'admin';
 
-module.exports = [shopConfig, adminConfig, bitbagSkeletonShop, bitbagSkeletonAdmin];
+module.exports = [shopConfig, adminConfig, bitbagProductAttributeGroupsShop, bitbagProductAttributeGroupsAdmin];
diff --git a/webpack.config.js b/webpack.config.js
index e296f82..f410f9c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,6 +1,6 @@
 const path = require('path');
 const Encore = require('@symfony/webpack-encore');
-const pluginName = 'skeleton';
+const pluginName = 'productAttributeGroups';
 
 const getConfig = (pluginName, type) => {
     Encore.reset();
@@ -21,8 +21,8 @@ const getConfig = (pluginName, type) => {
 }
 
 Encore
-    .setOutputPath(`src/Resources/public/`)
-    .setPublicPath(`/public/`)
+    .setOutputPath(`src/Resources/public/build/`)
+    .setPublicPath(`/public/build`)
     .addEntry(`bitbag-${pluginName}-shop`, path.resolve(__dirname, `./src/Resources/assets/shop/entry.js`))
     .addEntry(`bitbag-${pluginName}-admin`, path.resolve(__dirname, `./src/Resources/assets/admin/entry.js`))
     .cleanupOutputBeforeBuild()

From 475986b34c66443a9b12568023e033b699fd6b18 Mon Sep 17 00:00:00 2001
From: liszkapawel <pawel.liszka00@gmail.com>
Date: Thu, 4 Aug 2022 17:10:42 +0200
Subject: [PATCH 2/2] Change webpack config order

---
 webpack.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index f410f9c..c1ba5b6 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -34,7 +34,7 @@ distConfig.name = `bitbag-plugin-dist`;
 
 Encore.reset();
 
-const shopConfig = getConfig(pluginName, 'shop')
 const adminConfig = getConfig(pluginName, 'admin')
+const shopConfig = getConfig(pluginName, 'shop')
 
-module.exports = [shopConfig, adminConfig, distConfig];
+module.exports = [adminConfig, shopConfig, distConfig];