feat: upgrade 5.1 - fix bug listing

synolia · Jan 25, 2024 · d45663f · d45663f
1 parent f6107b6
commit d45663f
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 30 deletions.
diff --git a/src/Synolia/Bundle/FavoriteBundle/EventListener/ProductListAddFavoriteEventListener.php b/src/Synolia/Bundle/FavoriteBundle/EventListener/ProductListAddFavoriteEventListener.php
@@ -27,13 +27,13 @@ public function onBuildResult(BuildResultProductListEvent $event): void
  $user = $this->tokenAccessor->getUser();
  $organization = $this->tokenAccessor->getOrganization();
 
- if (!$user instanceof CustomerUser || !$organization instanceof Organization || 0 === \count($records)) {
+ if (0 === \count($records)) {
  return;
  }
 
  /** @var FavoriteRepository $favoriteRepo */
  $favoriteRepo = $this->entityManager->getRepository(Favorite::class);
- $favorites = $favoriteRepo->getFavoritesProductsInSingleArray($user, $organization);
+ $favorites = !$user instanceof CustomerUser || !$organization instanceof Organization ? [] : $favoriteRepo->getFavoritesProductsInSingleArray($user, $organization);
 
  foreach ($event->getProductData() as $productId => $data) {
  $productView = $event->getProductView($productId);

diff --git a/src/Synolia/Bundle/FavoriteBundle/Resources/config/oro/datagrids.yml b/src/Synolia/Bundle/FavoriteBundle/Resources/config/oro/datagrids.yml
@@ -1,6 +1,3 @@
 datagrids:
  synolia-favorite-grid:
  extends: frontend-product-search-grid
- query:
- select:
- - integer.product_id
diff --git a/.../Bundle/FavoriteBundle/Resources/public/default/scss/components/favorite-button-ajax.scss b/.../Bundle/FavoriteBundle/Resources/public/default/scss/components/favorite-button-ajax.scss
@@ -1,14 +1,19 @@
-.favorite-button-ajax {
- padding: $favorite-button-padding;
- &__icon {
- color: $favorite-button-color;
- font-size: $favorite-button-font-size;
- cursor: pointer;
- &:focus, &:active {
- color: $favorite-button-color-focus;
+.favorite-button {
+ position: relative;
+ z-index: 1;
+ &-ajax {
+ &.btn {
+ padding: $favorite-button-padding;
  }
- &:hover {
- color: $favorite-button-color-hover;
+ &__icon {
+ color: $favorite-button-color;
+ font-size: $favorite-button-font-size;
+ &:focus, &:active {
+ color: $favorite-button-color-focus;
+ }
+ &:hover {
+ color: $favorite-button-color-hover;
+ }
  }
  }
 }
diff --git a/...Bundle/FavoriteBundle/Resources/public/default/scss/variables/favorite-button-config.scss b/...Bundle/FavoriteBundle/Resources/public/default/scss/variables/favorite-button-config.scss
@@ -1,5 +1,5 @@
 $favorite-button-color: get-color('primary', 'main');
 $favorite-button-font-size: 36px;
-$favorite-button-padding: $offset-y 0;
+$favorite-button-padding: $offset-y*0.5;
 $favorite-button-color-hover: get-color('primary', 'dark');
 $favorite-button-color-focus: $favorite-button-color;
diff --git a/src/Synolia/Bundle/FavoriteBundle/Resources/public/js/app/views/favorite-button-ajax.js b/src/Synolia/Bundle/FavoriteBundle/Resources/public/js/app/views/favorite-button-ajax.js
@@ -28,7 +28,6 @@ const AjaxButtonView = BaseView.extend({
  const status = self.getStatus(response.status);
  messenger.notificationFlashMessage(status, response.message);
  self.updateIcon($(e.currentTarget), response.status);
- messenger.notificationFlashMessage('error', __('synolia_favorite_bundle.notification.error'));
 
  mediator.trigger('datagrid:doRefresh:synolia-favorite-grid');
  }
@@ -48,12 +47,13 @@ const AjaxButtonView = BaseView.extend({
  full: 'fa-heart',
  empty: 'fa-heart-o'
  };
-
- $(target)
- .children('i')
- .removeClass('fa-heart')
- .removeClass('fa-heart-o')
- .addClass(`${icon[status]}`);
+ if(icon.hasOwnProperty(status)) {
+ $(target)
+ .children('i')
+ .removeClass('fa-heart')
+ .removeClass('fa-heart-o')
+ .addClass(`${icon[status]}`);
+ }
  }
 });
 

diff --git a/...urces/views/layouts/default/imports/oro_product_list_item/oro_product_list_item.html.twig b/...urces/views/layouts/default/imports/oro_product_list_item/oro_product_list_item.html.twig
@@ -2,16 +2,17 @@
 
  {% set attr = layout_attr_defaults(attr, {
  'data-page-component-view': 'synoliafavorite/js/app/views/favorite-button-ajax',
- 'data-page-component-options': {'product': product}|json_encode
+ 'data-page-component-options': {'product': product}|json_encode,
+ '~class': 'favorite-button'
  }) %}
 
  <div {{ block('block_attributes') }}>
 
  {{ block_widget(block) }}
 
  {% set heartSvg = is_favorite_product(product) ? 'heart' : 'heart-o' %}
- <button class="btn btn--link favorite-button-ajax favorite-button-ajax__icon">
- <i class="fa fa-{{ heartSvg }} favorite-button__icon" aria-hidden="true"></i>
+ <button class="btn btn--link favorite-button-ajax">
+ <i class="fa fa-{{ heartSvg }}  favorite-button-ajax__icon" aria-hidden="true"></i>
  </button>
 
  </div>

diff --git a/...e/Resources/views/layouts/default/imports/oro_product_list_item/oro_product_list_item.yml b/...e/Resources/views/layouts/default/imports/oro_product_list_item/oro_product_list_item.yml
@@ -5,5 +5,5 @@ layout:
  - '@add':
  id: __favorite
  blockType: block
- parentId: __product_specification
+ parentId: __product_image_holder
  conditions: 'context["isFavoriteEnabled"] == true'
diff --git a/...Bundle/Resources/views/layouts/default/oro_product_frontend_product_view/layout.html.twig b/...Bundle/Resources/views/layouts/default/oro_product_frontend_product_view/layout.html.twig
@@ -2,15 +2,16 @@
 
  {% set attr = layout_attr_defaults(attr, {
  'data-page-component-view': 'synoliafavorite/js/app/views/favorite-button-ajax',
- 'data-page-component-options': { 'product': product }|json_encode
+ 'data-page-component-options': { 'product': product }|json_encode,
+ '~class': 'favorite-button'
  }) %}
 
  <div {{ block('block_attributes') }}>
 
  {{ block_widget(block) }}
  {% set heartSvg = is_favorite_product(product) ? 'heart' : 'heart-o' %}
- <button class="btn btn--link favorite-button-ajax favorite-button-ajax__icon">
- <i class="fa fa-{{ heartSvg }} favorite-button__icon" aria-hidden="true"></i>
+ <button class="btn btn--link favorite-button-ajax">
+ <i class="fa fa-{{ heartSvg }} favorite-button-ajax__icon" aria-hidden="true"></i>
  </button>
 
  </div>