Changes after CR

NoResponseMate · May 17, 2024 · f7378ae · f7378ae
1 parent d8e1758
commit f7378ae
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/src/Sylius/Behat/Page/Admin/Product/ShowPage.php b/src/Sylius/Behat/Page/Admin/Product/ShowPage.php
@@ -26,7 +26,7 @@ public function isSimpleProductPage(): bool
 
     public function isShowInShopButtonDisabled(): bool
     {
-        return $this->getElement('show_product_single_button')->hasClass('disabled');
+        return $this->getElement('show_product_button')->hasClass('disabled');
     }
 
     public function getAppliedCatalogPromotionsLinks(string $variantName, string $channelName): array
@@ -60,12 +60,12 @@ public function getRouteName(): string
 
     public function showProductInChannel(string $channel): void
     {
-        $this->getElement('show_product_dropdown')->clickLink($channel);
+        $this->getElement('show_product_button')->clickLink($channel);
     }
 
     public function showProductInSingleChannel(): void
     {
-        $this->getElement('show_product_single_button')->click();
+        $this->getElement('show_product_button')->click();
     }
 
     public function showProductEditPage(): void
@@ -85,8 +85,7 @@ protected function getDefinedElements(): array
             'edit_product_button' => '#edit-product',
             'edit_variant_button' => '#variants .variants-accordion__title:contains("%variantCode%") .edit-variant',
             'product_name' => '#header h1 .content > span',
-            'show_product_dropdown' => '[data-test-view-in-store]',
-            'show_product_single_button' => '[data-test-view-in-store]',
+            'show_product_button' => '[data-test-view-in-store]',
             'variants' => '#variants',
         ]);
     }

diff --git a/src/Sylius/Behat/Page/Admin/Product/UpdateSimpleProductPage.php b/src/Sylius/Behat/Page/Admin/Product/UpdateSimpleProductPage.php
@@ -285,22 +285,22 @@ public function goToVariantGeneration(): void
 
     public function getShowProductInSingleChannelUrl(): string
     {
-        return $this->getElement('show_product_single_button')->getAttribute('href');
+        return $this->getElement('show_product_button')->getAttribute('href');
     }
 
     public function isShowInShopButtonDisabled(): bool
     {
-        return $this->getElement('show_product_single_button')->hasClass('disabled');
+        return $this->getElement('show_product_button')->hasClass('disabled');
     }
 
     public function showProductInChannel(string $channel): void
     {
-        $this->getElement('show_product_dropdown')->clickLink($channel);
+        $this->getElement('show_product_button')->clickLink($channel);
     }
 
     public function showProductInSingleChannel(): void
     {
-        $this->getElement('show_product_single_button')->click();
+        $this->getElement('show_product_button')->click();
     }
 
     public function disable(): void
@@ -365,8 +365,7 @@ protected function getDefinedElements(): array
                 'product_taxon' => '#sylius-product-taxonomy-tree .item .header:contains("%taxonName%") input',
                 'product_taxons' => '#sylius_product_productTaxons',
                 'shipping_required' => '#sylius_product_variant_shippingRequired',
-                'show_product_dropdown' => '[data-test-view-in-store]',
-                'show_product_single_button' => '[data-test-view-in-store]',
+                'show_product_button' => '[data-test-view-in-store]',
                 'slug' => '#sylius_product_translations_%locale%_slug',
                 'tab' => '.menu [data-tab="%name%"]',
                 'taxonomy' => 'a[data-tab="taxonomy"]',

diff --git a/...e/AdminBundle/templates/product/common/header/title_block/actions/view_in_store.html.twig b/...e/AdminBundle/templates/product/common/header/title_block/actions/view_in_store.html.twig
@@ -1,21 +1,21 @@
 {% from '@SyliusAdmin/shared/helper/icon.html.twig' import icon as _icon %}
 
 {% set product = (hookable_metadata.context.resource) %}
-{% set enabledChannels = product.channels|filter(channel => channel.enabled == true) %}
+{% set enabled_channels = product.channels|filter(channel => channel.enabled == true) %}
 
 {% if sylius_bundle_loaded_checker('SyliusShopBundle') %}
-    {% if not product.enabled or enabledChannels|length < 1 %}
+    {% if not product.enabled or enabled_channels|length < 1 %}
         <a class="btn disabled" href="{{ (url is not defined) ? '#' : url|raw }}" target="_blank" {{ sylius_test_html_attribute('view-in-store') }}>
             {{ _icon({ icon: 'arrow-up-right', class: 'icon icon-tabler' }) }}
             {{ 'sylius.ui.view_in_store'|trans }}
         </a>
-    {% elseif enabledChannels|length > 1 %}
+    {% elseif enabled_channels|length > 1 %}
         <div class="dropdown">
             <button class="btn dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
                 {{ 'sylius.ui.view_in_store'|trans }}
             </button>
             <ul class="dropdown-menu" {{ sylius_test_html_attribute('view-in-store') }}>
-                {% for channel in enabledChannels %}
+                {% for channel in enabled_channels %}
                     {% set product_translation = sylius_product_translation(product, channel) %}
                     {% if product_translation is not null %}
                         {% set url = sylius_channel_url(path('sylius_shop_product_show', {'slug': product_translation.slug, '_locale': product_translation.locale}), channel) %}
@@ -35,7 +35,7 @@
             </ul>
         </div>
     {% else %}
-        {% for channel in enabledChannels %}
+        {% for channel in enabled_channels %}
             {% set product_translation = sylius_product_translation(product, channel) %}
             {% if product_translation is not null %}
                 {% set url = sylius_channel_url(path('sylius_shop_product_show', {'slug': product_translation.slug, '_locale': product_translation.locale}), channel) %}